From 7e6f5aa734e5b489bea9f39afb620319afd90696 Mon Sep 17 00:00:00 2001 From: Adam Roben Date: Mon, 2 Dec 2013 11:47:58 -0500 Subject: [PATCH] Update for ui -> gfx moves in Chrome 31 See https://codereview.chromium.org/23769011. --- brightray/browser/win/devtools_window.h | 4 ++-- .../browser/win/inspectable_web_contents_view_win.cc | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/brightray/browser/win/devtools_window.h b/brightray/browser/win/devtools_window.h index 738af0a427ca..a6b11bb11e0c 100644 --- a/brightray/browser/win/devtools_window.h +++ b/brightray/browser/win/devtools_window.h @@ -2,13 +2,13 @@ #define BRIGHTRAY_BROWSER_WIN_DEVTOOLS_WINDOW_H_ #include "base/memory/weak_ptr.h" -#include "ui/base/win/window_impl.h" +#include "ui/gfx/win/window_impl.h" namespace brightray { class InspectableWebContentsViewWin; -class DevToolsWindow : public ui::WindowImpl, +class DevToolsWindow : public gfx::WindowImpl, public base::SupportsWeakPtr { public: static DevToolsWindow* Create( diff --git a/brightray/browser/win/inspectable_web_contents_view_win.cc b/brightray/browser/win/inspectable_web_contents_view_win.cc index a25cdc8919f7..491357131941 100644 --- a/brightray/browser/win/inspectable_web_contents_view_win.cc +++ b/brightray/browser/win/inspectable_web_contents_view_win.cc @@ -5,7 +5,7 @@ #include "browser/win/devtools_window.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 { @@ -44,9 +44,9 @@ void InspectableWebContentsViewWin::ShowDevTools() { auto contents_view = inspectable_web_contents_->GetWebContents()->GetView(); auto size = contents_view->GetContainerSize(); size.Enlarge(-kWindowInset, -kWindowInset); - ui::CenterAndSizeWindow(contents_view->GetNativeView(), - devtools_window_->hwnd(), - size); + gfx::CenterAndSizeWindow(contents_view->GetNativeView(), + devtools_window_->hwnd(), + size); ShowWindow(devtools_window_->hwnd(), SW_SHOWNORMAL); }