mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Merge pull request #12660 from electron/mac-views

Browse source 
Refactor NativeWindow (Part 8): Prepare work for using views::Widget on macOS
This commit is contained in:
Cheng Zhao 2018-04-20 21:31:28 +09:00 • committed by GitHub
commit 28b85762fd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 799 additions and 595 deletions
Download patch file Download diff file Expand all files Collapse all files

8
brightray/browser/browser_main_parts.cc
View file

@ -43,10 +43,6 @@
#include "ui/wm/core/wm_state.h"
#endif
#if defined(TOOLKIT_VIEWS)
#include "brightray/browser/views/views_delegate.h"
#endif
#if defined(USE_X11)
#include "base/environment.h"
#include "base/nix/xdg_util.h"
@ -209,10 +205,6 @@ void BrowserMainParts::ToolkitInitialized() {
wm_state_.reset(new wm::WMState);
#endif
#if defined(TOOLKIT_VIEWS)
views_delegate_.reset(new ViewsDelegate);
#endif
#if defined(OS_WIN)
gfx::PlatformFontWin::adjust_font_callback = &AdjustUIFont;
gfx::PlatformFontWin::get_minimum_font_size_callback = &GetMinimumFontSize;

10
brightray/browser/browser_main_parts.h
View file

@ -16,12 +16,6 @@
#include "content/public/browser/browser_main_parts.h"
#include "ui/views/layout/layout_provider.h"
#if defined(TOOLKIT_VIEWS)
namespace brightray {
class ViewsDelegate;
}
#endif
#if defined(USE_AURA)
namespace wm {
class WMState;
@ -56,10 +50,6 @@ class BrowserMainParts : public content::BrowserMainParts {
std::unique_ptr<IOThread> io_thread_;
#if defined(TOOLKIT_VIEWS)
std::unique_ptr<ViewsDelegate> views_delegate_;
#endif
#if defined(USE_AURA)
std::unique_ptr<wm::WMState> wm_state_;
#endif