diff options
Diffstat (limited to 'chrome/browser/chromeos')
5 files changed, 9 insertions, 9 deletions
diff --git a/chrome/browser/chromeos/frame/browser_frame_chromeos.cc b/chrome/browser/chromeos/frame/browser_frame_chromeos.cc index 690956a..876f67f4 100644 --- a/chrome/browser/chromeos/frame/browser_frame_chromeos.cc +++ b/chrome/browser/chromeos/frame/browser_frame_chromeos.cc @@ -40,10 +40,11 @@ void BrowserFrameChromeos::InitBrowserFrame() { bool BrowserFrameChromeos::IsMaximized() const { if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kChromeosFrame)) - return WindowGtk::IsMaximized(); + return NativeWindowGtk::IsMaximized(); bool is_popup_or_panel = browser_view()->IsBrowserTypePopup() || browser_view()->IsBrowserTypePanel(); - return !IsFullscreen() && (!is_popup_or_panel || WindowGtk::IsMaximized()); + return !IsFullscreen() && + (!is_popup_or_panel || NativeWindowGtk::IsMaximized()); } } // namespace chromeos diff --git a/chrome/browser/chromeos/frame/browser_frame_chromeos.h b/chrome/browser/chromeos/frame/browser_frame_chromeos.h index abfbef4..22f33f2 100644 --- a/chrome/browser/chromeos/frame/browser_frame_chromeos.h +++ b/chrome/browser/chromeos/frame/browser_frame_chromeos.h @@ -18,7 +18,7 @@ class BrowserFrameChromeos : public BrowserFrameGtk { // BrowserFrameGtk overrides. virtual void InitBrowserFrame(); - // views::WindowGtk overrides. + // views::NativeWindowGtk overrides. virtual bool IsMaximized() const; private: diff --git a/chrome/browser/chromeos/frame/bubble_window.cc b/chrome/browser/chromeos/frame/bubble_window.cc index 4b1ff08..a0ddb6e 100644 --- a/chrome/browser/chromeos/frame/bubble_window.cc +++ b/chrome/browser/chromeos/frame/bubble_window.cc @@ -31,12 +31,12 @@ namespace chromeos { const SkColor BubbleWindow::kBackgroundColor = SK_ColorWHITE; BubbleWindow::BubbleWindow(views::Window* window) - : views::WindowGtk::WindowGtk(window) { + : views::NativeWindowGtk(window) { MakeTransparent(); } void BubbleWindow::InitNativeWidget(const views::Widget::InitParams& params) { - views::WindowGtk::InitNativeWidget(params); + views::NativeWindowGtk::InitNativeWidget(params); // Turn on double buffering so that the hosted GtkWidgets does not // flash as in http://crosbug.com/9065. diff --git a/chrome/browser/chromeos/frame/bubble_window.h b/chrome/browser/chromeos/frame/bubble_window.h index 070e745..621e41f 100644 --- a/chrome/browser/chromeos/frame/bubble_window.h +++ b/chrome/browser/chromeos/frame/bubble_window.h @@ -7,7 +7,7 @@ #pragma once #include "third_party/skia/include/core/SkColor.h" -#include "views/window/window_gtk.h" +#include "views/window/native_window_gtk.h" namespace gfx { class Rect; @@ -21,7 +21,7 @@ class WindowDelegate; namespace chromeos { // A window that uses BubbleFrameView as its frame. -class BubbleWindow : public views::WindowGtk { +class BubbleWindow : public views::NativeWindowGtk { public: enum Style { STYLE_GENERIC = 0, // Default style. @@ -40,7 +40,7 @@ class BubbleWindow : public views::WindowGtk { protected: explicit BubbleWindow(views::Window* window); - // Overidden from views::WindowGtk: + // Overidden from views::NativeWindowGtk: virtual void InitNativeWidget( const views::Widget::InitParams& params) OVERRIDE; diff --git a/chrome/browser/chromeos/login/screen_locker_browsertest.cc b/chrome/browser/chromeos/login/screen_locker_browsertest.cc index 01de11e..f143511 100644 --- a/chrome/browser/chromeos/login/screen_locker_browsertest.cc +++ b/chrome/browser/chromeos/login/screen_locker_browsertest.cc @@ -24,7 +24,6 @@ #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "views/controls/textfield/textfield.h" -#include "views/window/window_gtk.h" namespace { |