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

Update for ui -> gfx moves in Chrome 31

Browse source 
See https://codereview.chromium.org/23769011.
This commit is contained in:
Adam Roben 2013-12-02 11:47:58 -05:00
parent 9c5b81bf7a
commit 7e6f5aa734
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
brightray/browser/win/devtools_window.h
View file

@ -2,13 +2,13 @@
#define BRIGHTRAY_BROWSER_WIN_DEVTOOLS_WINDOW_H_ #define BRIGHTRAY_BROWSER_WIN_DEVTOOLS_WINDOW_H_
#include "base/memory/weak_ptr.h" #include "base/memory/weak_ptr.h"
#include "ui/base/win/window_impl.h" #include "ui/gfx/win/window_impl.h"
namespace brightray { namespace brightray {
class InspectableWebContentsViewWin; class InspectableWebContentsViewWin;
class DevToolsWindow : public ui::WindowImpl, class DevToolsWindow : public gfx::WindowImpl,
public base::SupportsWeakPtr<DevToolsWindow> { public base::SupportsWeakPtr<DevToolsWindow> {
public: public:
static DevToolsWindow* Create( static DevToolsWindow* Create(

8
brightray/browser/win/inspectable_web_contents_view_win.cc
View file

@ -5,7 +5,7 @@
#include "browser/win/devtools_window.h" #include "browser/win/devtools_window.h"
#include "content/public/browser/web_contents_view.h" #include "content/public/browser/web_contents_view.h"
#include "ui/base/win/hwnd_util.h" #include "ui/gfx/win/hwnd_util.h"
namespace brightray { namespace brightray {
@ -44,9 +44,9 @@ void InspectableWebContentsViewWin::ShowDevTools() {
auto contents_view = inspectable_web_contents_->GetWebContents()->GetView(); auto contents_view = inspectable_web_contents_->GetWebContents()->GetView();
auto size = contents_view->GetContainerSize(); auto size = contents_view->GetContainerSize();
size.Enlarge(-kWindowInset, -kWindowInset); size.Enlarge(-kWindowInset, -kWindowInset);
ui::CenterAndSizeWindow(contents_view->GetNativeView(), gfx::CenterAndSizeWindow(contents_view->GetNativeView(),
devtools_window_->hwnd(), devtools_window_->hwnd(),
size); size);
ShowWindow(devtools_window_->hwnd(), SW_SHOWNORMAL); ShowWindow(devtools_window_->hwnd(), SW_SHOWNORMAL);
} }