mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-02-23 07:27:42 +01:00
Controls now respect OS and Chrome themes by default for both Alloy and Chrome runtimes. Chrome themes (mode and colors) can be configured using the new CefRequestContext::SetChromeColorScheme method. Individual theme colors can be overridden using the new CefWindowDelegate:: OnThemeColorsChanged and CefWindow::SetThemeColor methods. The `--force-light-mode` and `--force-dark-mode` command-line flags are now respected on all platforms as an override for the OS theme. The current Chrome theme, if any, will take precedence over the OS theme when determining light/dark status. On Windows and MacOS the titlebar color will also be updated to match the light/dark theme. Testable as follows: - Run: `cefclient --enable-chrome-runtime` OR `cefclient --use-views --persist-user-preferences --cache-path=...` - App launches with default OS light/dark theme colors. - Change OS dark/light theme under system settings. Notice that theme colors change as expected. - Right click, select items from the new Theme sub-menu. Notice that theme colors behave as expected. - Exit and relaunch the app. Notice that the last-used theme colors are applied on app restart. - Add `--background-color=green` to above command-line. - Perform the same actions as above. Notice that all controls start and remain green throughout (except some icons with Chrome runtime). - Add `--force-light-mode` or `--force-dark-mode` to above command-line. - Perform the same actions as above. Notice that OS dark/light theme changes are ignored, but Chrome theme changes work as expected.
143 lines
5.0 KiB
C++
143 lines
5.0 KiB
C++
// Copyright 2016 The Chromium Embedded Framework Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style license that can be found
|
|
// in the LICENSE file.
|
|
|
|
#ifndef CEF_LIBCEF_BROWSER_VIEWS_BROWSER_VIEW_IMPL_H_
|
|
#define CEF_LIBCEF_BROWSER_VIEWS_BROWSER_VIEW_IMPL_H_
|
|
#pragma once
|
|
|
|
#include "include/cef_client.h"
|
|
#include "include/views/cef_browser_view.h"
|
|
#include "include/views/cef_browser_view_delegate.h"
|
|
#include "libcef/browser/browser_host_base.h"
|
|
#include "libcef/browser/views/browser_view_view.h"
|
|
#include "libcef/browser/views/view_impl.h"
|
|
|
|
#include "base/functional/callback_forward.h"
|
|
#include "base/memory/weak_ptr.h"
|
|
#include "ui/views/controls/webview/unhandled_keyboard_event_handler.h"
|
|
|
|
class CefBrowserHostBase;
|
|
class CefWidget;
|
|
class CefWindowImpl;
|
|
class ChromeBrowserView;
|
|
class Profile;
|
|
|
|
class CefBrowserViewImpl
|
|
: public CefViewImpl<views::View, CefBrowserView, CefBrowserViewDelegate>,
|
|
public CefBrowserViewView::Delegate {
|
|
public:
|
|
using ParentClass =
|
|
CefViewImpl<views::View, CefBrowserView, CefBrowserViewDelegate>;
|
|
|
|
CefBrowserViewImpl(const CefBrowserViewImpl&) = delete;
|
|
CefBrowserViewImpl& operator=(const CefBrowserViewImpl&) = delete;
|
|
|
|
// Create a new CefBrowserView instance. |delegate| may be nullptr.
|
|
// |window_info| will only be used when creating a Chrome child window.
|
|
static CefRefPtr<CefBrowserViewImpl> Create(
|
|
const CefWindowInfo& window_info,
|
|
CefRefPtr<CefClient> client,
|
|
const CefString& url,
|
|
const CefBrowserSettings& settings,
|
|
CefRefPtr<CefDictionaryValue> extra_info,
|
|
CefRefPtr<CefRequestContext> request_context,
|
|
CefRefPtr<CefBrowserViewDelegate> delegate);
|
|
|
|
// Create a new CefBrowserView instance for a popup. |delegate| may be
|
|
// nullptr.
|
|
static CefRefPtr<CefBrowserViewImpl> CreateForPopup(
|
|
const CefBrowserSettings& settings,
|
|
CefRefPtr<CefBrowserViewDelegate> delegate);
|
|
|
|
// Called from CefBrowserPlatformDelegate[Chrome]Views.
|
|
void WebContentsCreated(content::WebContents* web_contents);
|
|
void WebContentsDestroyed(content::WebContents* web_contents);
|
|
void BrowserCreated(CefBrowserHostBase* browser,
|
|
base::RepeatingClosure on_bounds_changed);
|
|
void BrowserDestroyed(CefBrowserHostBase* browser);
|
|
|
|
// Called to handle accelerators when the event is unhandled by the web
|
|
// content and the browser client.
|
|
bool HandleKeyboardEvent(const content::NativeWebKeyboardEvent& event);
|
|
|
|
// CefBrowserView methods:
|
|
CefRefPtr<CefBrowser> GetBrowser() override;
|
|
CefRefPtr<CefView> GetChromeToolbar() override;
|
|
void SetPreferAccelerators(bool prefer_accelerators) override;
|
|
|
|
// CefView methods:
|
|
CefRefPtr<CefBrowserView> AsBrowserView() override { return this; }
|
|
void RequestFocus() override;
|
|
void SetBackgroundColor(cef_color_t color) override;
|
|
|
|
// CefViewAdapter methods:
|
|
void Detach() override;
|
|
std::string GetDebugType() override { return "BrowserView"; }
|
|
void GetDebugInfo(base::Value::Dict* info, bool include_children) override;
|
|
|
|
// CefBrowserViewView::Delegate methods:
|
|
void OnBrowserViewAdded() override;
|
|
void AddedToWidget() override;
|
|
void RemovedFromWidget() override;
|
|
void OnBoundsChanged() override;
|
|
bool OnGestureEvent(ui::GestureEvent* event) override;
|
|
|
|
// Return the WebView representation of this object.
|
|
views::WebView* web_view() const;
|
|
|
|
// Return the CEF specialization of BrowserView.
|
|
ChromeBrowserView* chrome_browser_view() const;
|
|
|
|
// Return the CefWindowImpl hosting this object.
|
|
CefWindowImpl* cef_window_impl() const;
|
|
|
|
private:
|
|
// Create a new implementation object.
|
|
// Always call Initialize() after creation.
|
|
// |delegate| may be nullptr.
|
|
explicit CefBrowserViewImpl(CefRefPtr<CefBrowserViewDelegate> delegate);
|
|
|
|
void SetPendingBrowserCreateParams(
|
|
const CefWindowInfo& window_info,
|
|
CefRefPtr<CefClient> client,
|
|
const CefString& url,
|
|
const CefBrowserSettings& settings,
|
|
CefRefPtr<CefDictionaryValue> extra_info,
|
|
CefRefPtr<CefRequestContext> request_context);
|
|
|
|
void SetDefaults(const CefBrowserSettings& settings);
|
|
|
|
// CefViewImpl methods:
|
|
views::View* CreateRootView() override;
|
|
void InitializeRootView() override;
|
|
|
|
// Logic extracted from UnhandledKeyboardEventHandler::HandleKeyboardEvent for
|
|
// the handling of accelerators. Returns true if the event was handled by the
|
|
// accelerator.
|
|
bool HandleAccelerator(const content::NativeWebKeyboardEvent& event,
|
|
views::FocusManager* focus_manager);
|
|
|
|
void RequestFocusInternal();
|
|
|
|
void DisassociateFromWidget();
|
|
|
|
std::unique_ptr<CefBrowserCreateParams> pending_browser_create_params_;
|
|
|
|
CefRefPtr<CefBrowserHostBase> browser_;
|
|
|
|
views::UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_;
|
|
bool ignore_next_char_event_ = false;
|
|
|
|
base::RepeatingClosure on_bounds_changed_;
|
|
|
|
CefWidget* cef_widget_ = nullptr;
|
|
Profile* profile_ = nullptr;
|
|
|
|
base::WeakPtrFactory<CefBrowserViewImpl> weak_ptr_factory_;
|
|
|
|
IMPLEMENT_REFCOUNTING_DELETE_ON_UIT(CefBrowserViewImpl);
|
|
};
|
|
|
|
#endif // CEF_LIBCEF_BROWSER_VIEWS_BROWSER_VIEW_IMPL_H_
|