summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/chromeos/frame/browser_frame_chromeos.cc5
-rw-r--r--chrome/browser/chromeos/frame/browser_frame_chromeos.h2
-rw-r--r--chrome/browser/chromeos/frame/bubble_window.cc4
-rw-r--r--chrome/browser/chromeos/frame/bubble_window.h6
-rw-r--r--chrome/browser/chromeos/login/screen_locker_browsertest.cc1
-rw-r--r--chrome/browser/ui/views/constrained_window_views.cc4
-rw-r--r--chrome/browser/ui/views/frame/browser_frame.cc8
-rw-r--r--chrome/browser/ui/views/frame/browser_frame_gtk.cc8
-rw-r--r--chrome/browser/ui/views/frame/browser_frame_gtk.h6
-rw-r--r--chrome/browser/ui/views/frame/browser_frame_win.cc16
-rw-r--r--chrome/browser/ui/views/frame/browser_frame_win.h12
-rw-r--r--chrome/browser/ui/views/frame/browser_view.cc14
-rw-r--r--chrome/browser/ui/views/frame/opaque_browser_frame_view.cc7
-rw-r--r--chrome/browser/ui/views/html_dialog_view.cc6
-rw-r--r--chrome/browser/ui/views/keyboard_overlay_dialog_view.cc4
-rw-r--r--chrome/browser/ui/views/native_constrained_window_win.cc12
16 files changed, 57 insertions, 58 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 {
diff --git a/chrome/browser/ui/views/constrained_window_views.cc b/chrome/browser/ui/views/constrained_window_views.cc
index 01d2be5..fa6fd7f 100644
--- a/chrome/browser/ui/views/constrained_window_views.cc
+++ b/chrome/browser/ui/views/constrained_window_views.cc
@@ -37,7 +37,7 @@
#if defined(OS_WIN)
#include "views/widget/native_widget_win.h"
-#include "views/window/window_win.h"
+#include "views/window/native_window_win.h"
#endif
using base::TimeDelta;
@@ -556,7 +556,7 @@ void ConstrainedWindowFrameView::InitClass() {
static bool initialized = false;
if (!initialized) {
#if defined(OS_WIN)
- title_font_ = new gfx::Font(views::WindowWin::GetWindowTitleFont());
+ title_font_ = new gfx::Font(views::NativeWindowWin::GetWindowTitleFont());
#endif
initialized = true;
}
diff --git a/chrome/browser/ui/views/frame/browser_frame.cc b/chrome/browser/ui/views/frame/browser_frame.cc
index cc30358..5e6ad1d 100644
--- a/chrome/browser/ui/views/frame/browser_frame.cc
+++ b/chrome/browser/ui/views/frame/browser_frame.cc
@@ -128,10 +128,10 @@ void BrowserFrame::OnNativeWindowActivationChanged(bool active) {
if (active) {
// When running under remote desktop, if the remote desktop client is not
// active on the users desktop, then none of the windows contained in the
- // remote desktop will be activated. However, WindowWin::Activate will
- // still bring this browser window to the foreground. We explicitly set
- // ourselves as the last active browser window to ensure that we get treated
- // as such by the rest of Chrome.
+ // remote desktop will be activated. However, NativeWindowWin::Activate()
+ // will still bring this browser window to the foreground. We explicitly
+ // set ourselves as the last active browser window to ensure that we get
+ // treated as such by the rest of Chrome.
BrowserList::SetLastActive(browser_view_->browser());
}
Window::OnNativeWindowActivationChanged(active);
diff --git a/chrome/browser/ui/views/frame/browser_frame_gtk.cc b/chrome/browser/ui/views/frame/browser_frame_gtk.cc
index dd1cee8..0583a01 100644
--- a/chrome/browser/ui/views/frame/browser_frame_gtk.cc
+++ b/chrome/browser/ui/views/frame/browser_frame_gtk.cc
@@ -25,7 +25,7 @@ const gfx::Font& BrowserFrame::GetTitleFont() {
BrowserFrameGtk::BrowserFrameGtk(BrowserFrame* browser_frame,
BrowserView* browser_view)
- : views::WindowGtk(browser_frame),
+ : views::NativeWindowGtk(browser_frame),
browser_view_(browser_view) {
// Don't focus anything on creation, selecting a tab will set the focus.
set_focus_on_creation(false);
@@ -59,12 +59,12 @@ void BrowserFrameGtk::TabStripDisplayModeChanged() {
}
////////////////////////////////////////////////////////////////////////////////
-// BrowserFrameGtk, WindowGtk overrides :
+// BrowserFrameGtk, NativeWindowGtk overrides:
gboolean BrowserFrameGtk::OnWindowStateEvent(GtkWidget* widget,
GdkEventWindowState* event) {
bool was_full_screen = IsFullscreen();
- gboolean result = views::WindowGtk::OnWindowStateEvent(widget, event);
+ gboolean result = views::NativeWindowGtk::OnWindowStateEvent(widget, event);
if ((!IsVisible() || IsMinimized()) && browser_view_->GetStatusBubble()) {
// The window is effectively hidden. We have to hide the status bubble as
// unlike windows gtk has no notion of child windows that are hidden along
@@ -79,7 +79,7 @@ gboolean BrowserFrameGtk::OnWindowStateEvent(GtkWidget* widget,
gboolean BrowserFrameGtk::OnConfigureEvent(GtkWidget* widget,
GdkEventConfigure* event) {
browser_view_->WindowMoved();
- return views::WindowGtk::OnConfigureEvent(widget, event);
+ return views::NativeWindowGtk::OnConfigureEvent(widget, event);
}
diff --git a/chrome/browser/ui/views/frame/browser_frame_gtk.h b/chrome/browser/ui/views/frame/browser_frame_gtk.h
index a499496..e1f0514 100644
--- a/chrome/browser/ui/views/frame/browser_frame_gtk.h
+++ b/chrome/browser/ui/views/frame/browser_frame_gtk.h
@@ -9,12 +9,12 @@
#include "base/basictypes.h"
#include "chrome/browser/ui/views/frame/browser_frame.h"
#include "chrome/browser/ui/views/frame/native_browser_frame.h"
-#include "views/window/window_gtk.h"
+#include "views/window/native_window_gtk.h"
class BrowserNonClientFrameView;
class BrowserRootView;
-class BrowserFrameGtk : public views::WindowGtk,
+class BrowserFrameGtk : public views::NativeWindowGtk,
public NativeBrowserFrame {
public:
// Normally you will create this class by calling BrowserFrame::Create.
@@ -29,7 +29,7 @@ class BrowserFrameGtk : public views::WindowGtk,
virtual int GetMinimizeButtonOffset() const OVERRIDE;
virtual void TabStripDisplayModeChanged() OVERRIDE;
- // Overridden from views::WindowGtk:
+ // Overridden from views::NativeWindowGtk:
virtual gboolean OnWindowStateEvent(GtkWidget* widget,
GdkEventWindowState* event);
virtual gboolean OnConfigureEvent(GtkWidget* widget,
diff --git a/chrome/browser/ui/views/frame/browser_frame_win.cc b/chrome/browser/ui/views/frame/browser_frame_win.cc
index 808cd39a3..cfba2d1 100644
--- a/chrome/browser/ui/views/frame/browser_frame_win.cc
+++ b/chrome/browser/ui/views/frame/browser_frame_win.cc
@@ -33,7 +33,7 @@ static int explicit_show_state = -1;
BrowserFrameWin::BrowserFrameWin(BrowserFrame* browser_frame,
BrowserView* browser_view)
- : views::WindowWin(browser_frame),
+ : views::NativeWindowWin(browser_frame),
browser_view_(browser_view),
browser_frame_(browser_frame) {
// Don't focus anything on creation, selecting a tab will set the focus.
@@ -49,7 +49,7 @@ void BrowserFrameWin::SetShowState(int state) {
}
///////////////////////////////////////////////////////////////////////////////
-// BrowserFrameWin, views::WindowWin overrides:
+// BrowserFrameWin, views::NativeWindowWin overrides:
int BrowserFrameWin::GetShowState() const {
if (explicit_show_state != -1)
@@ -67,7 +67,7 @@ gfx::Insets BrowserFrameWin::GetClientAreaInsets() const {
// frame.
if (!GetWindow()->ShouldUseNativeFrame() ||
!browser_view_->IsBrowserTypeNormal()) {
- return WindowWin::GetClientAreaInsets();
+ return NativeWindowWin::GetClientAreaInsets();
}
int border_thickness = GetSystemMetrics(SM_CXSIZEFRAME);
@@ -84,7 +84,7 @@ void BrowserFrameWin::UpdateFrameAfterFrameChange() {
// We need to update the glass region on or off before the base class adjusts
// the window region.
UpdateDWMFrame();
- WindowWin::UpdateFrameAfterFrameChange();
+ NativeWindowWin::UpdateFrameAfterFrameChange();
}
void BrowserFrameWin::OnEndSession(BOOL ending, UINT logoff) {
@@ -97,7 +97,7 @@ void BrowserFrameWin::OnInitMenuPopup(HMENU menu, UINT position,
}
void BrowserFrameWin::OnWindowPosChanged(WINDOWPOS* window_pos) {
- WindowWin::OnWindowPosChanged(window_pos);
+ NativeWindowWin::OnWindowPosChanged(window_pos);
UpdateDWMFrame();
// Windows lies to us about the position of the minimize button before a
@@ -117,7 +117,7 @@ void BrowserFrameWin::OnWindowPosChanged(WINDOWPOS* window_pos) {
void BrowserFrameWin::OnScreenReaderDetected() {
BrowserAccessibilityState::GetInstance()->OnScreenReaderDetected();
- WindowWin::OnScreenReaderDetected();
+ NativeWindowWin::OnScreenReaderDetected();
}
bool BrowserFrameWin::ShouldUseNativeFrame() const {
@@ -129,7 +129,7 @@ bool BrowserFrameWin::ShouldUseNativeFrame() const {
// theme is active for normal browser windows, we don't want to use the custom
// frame for popups/apps.
if (!browser_view_->IsBrowserTypeNormal() &&
- WindowWin::ShouldUseNativeFrame()) {
+ NativeWindowWin::ShouldUseNativeFrame()) {
return true;
}
@@ -204,7 +204,7 @@ void BrowserFrameWin::UpdateDWMFrame() {
// static
const gfx::Font& BrowserFrame::GetTitleFont() {
static gfx::Font* title_font =
- new gfx::Font(views::WindowWin::GetWindowTitleFont());
+ new gfx::Font(views::NativeWindowWin::GetWindowTitleFont());
return *title_font;
}
diff --git a/chrome/browser/ui/views/frame/browser_frame_win.h b/chrome/browser/ui/views/frame/browser_frame_win.h
index 499b15c..56391aeb 100644
--- a/chrome/browser/ui/views/frame/browser_frame_win.h
+++ b/chrome/browser/ui/views/frame/browser_frame_win.h
@@ -9,17 +9,17 @@
#include "base/basictypes.h"
#include "chrome/browser/ui/views/frame/browser_frame.h"
#include "chrome/browser/ui/views/frame/native_browser_frame.h"
-#include "views/window/window_win.h"
+#include "views/window/native_window_win.h"
class BrowserView;
-///////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
// BrowserFrameWin
//
-// BrowserFrame is a WindowWin subclass that provides the window frame for the
-// Chrome browser window.
+// BrowserFrame is a NativeWindowWin subclass that provides the window frame
+// for the Chrome browser window.
//
-class BrowserFrameWin : public views::WindowWin,
+class BrowserFrameWin : public views::NativeWindowWin,
public NativeBrowserFrame {
public:
BrowserFrameWin(BrowserFrame* browser_frame, BrowserView* browser_view);
@@ -33,7 +33,7 @@ class BrowserFrameWin : public views::WindowWin,
static void SetShowState(int state);
protected:
- // Overridden from views::WindowWin:
+ // Overridden from views::NativeWindowWin:
virtual int GetShowState() const OVERRIDE;
virtual gfx::Insets GetClientAreaInsets() const OVERRIDE;
virtual void UpdateFrameAfterFrameChange() OVERRIDE;
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index 25651b6..cfa881f 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -94,6 +94,7 @@
#include "views/focus/external_focus_tracker.h"
#include "views/focus/view_storage.h"
#include "views/layout/grid_layout.h"
+#include "views/widget/native_widget.h"
#include "views/widget/root_view.h"
#include "views/window/dialog_delegate.h"
#include "views/window/window.h"
@@ -103,11 +104,10 @@
#include "chrome/browser/jumplist_win.h"
#include "ui/base/message_box_win.h"
#include "ui/base/view_prop.h"
-#include "views/window/window_win.h"
+#include "views/window/native_window_win.h"
#elif defined(TOOLKIT_USES_GTK)
#include "chrome/browser/ui/views/accelerator_table_gtk.h"
#include "views/window/hit_test.h"
-#include "views/window/window_gtk.h"
#if !defined(TOUCH_UI)
#include "chrome/browser/ui/views/handle_web_keyboard_event_gtk.h"
#endif
@@ -288,7 +288,7 @@ class ResizeCorner : public views::View {
}
private:
- // Returns the WindowWin we're displayed in. Returns NULL if we're not
+ // Returns the NativeWindowWin we're displayed in. Returns NULL if we're not
// currently in a window.
views::Window* GetWindow() {
views::Widget* widget = GetWidget();
@@ -2254,7 +2254,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen) {
#endif
}
#if defined(OS_WIN)
- static_cast<views::WindowWin*>(frame_->native_window())->PushForceHidden();
+ static_cast<views::NativeWindowWin*>(frame_->native_window())->
+ PushForceHidden();
#endif
// Notify bookmark bar, so it can set itself to the appropriate drawing state.
@@ -2290,12 +2291,13 @@ void BrowserView::ProcessFullscreen(bool fullscreen) {
#endif
}
- // Undo our anti-jankiness hacks and force the window to relayout now that
+ // Undo our anti-jankiness hacks and force the window to re-layout now that
// it's in its final position.
ignore_layout_ = false;
Layout();
#if defined(OS_WIN)
- static_cast<views::WindowWin*>(frame_->native_window())->PopForceHidden();
+ static_cast<views::NativeWindowWin*>(frame_->native_window())->
+ PopForceHidden();
#endif
}
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
index 7a67dd0..17f789b 100644
--- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
+++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
@@ -1056,9 +1056,10 @@ void OpaqueBrowserFrameView::LayoutWindowControls() {
close_button_size.height());
#if defined(OS_CHROMEOS)
- // LayoutWindowControls could be triggered from WindowGtk::UpdateWindowTitle,
- // which could happen when user navigates in fullscreen mode. And because
- // BrowserFrameChromeos::IsMaximized return false for fullscreen mode, we
+ // LayoutWindowControls could be triggered from
+ // NativeWindowGtk::UpdateWindowTitle(), which could happen when user
+ // navigates in fullscreen mode. And because
+ // BrowserFrameChromeos::IsMaximized() return false for fullscreen mode, we
// explicitly test fullscreen mode here and make it use the same code path
// as maximized mode.
// TODO(oshima): Optimize the relayout logic to defer the frame view's
diff --git a/chrome/browser/ui/views/html_dialog_view.cc b/chrome/browser/ui/views/html_dialog_view.cc
index 55f4148..d373846 100644
--- a/chrome/browser/ui/views/html_dialog_view.cc
+++ b/chrome/browser/ui/views/html_dialog_view.cc
@@ -17,7 +17,7 @@
#include "views/window/window.h"
#if defined(TOOLKIT_USES_GTK)
-#include "views/window/window_gtk.h"
+#include "views/window/native_window_gtk.h"
#endif
namespace browser {
@@ -193,8 +193,8 @@ void HtmlDialogView::HandleKeyboardEvent(const NativeWebKeyboardEvent& event) {
DefWindowProc(event.os_event.hwnd, event.os_event.message,
event.os_event.wParam, event.os_event.lParam);
#elif defined(TOOLKIT_USES_GTK)
- views::WindowGtk* window_gtk =
- static_cast<views::WindowGtk*>(window()->native_window());
+ views::NativeWindowGtk* window_gtk =
+ static_cast<views::NativeWindowGtk*>(window()->native_window());
if (event.os_event && !event.skip_in_browser) {
views::KeyEvent views_event(reinterpret_cast<GdkEvent*>(event.os_event));
window_gtk->HandleKeyboardEvent(views_event);
diff --git a/chrome/browser/ui/views/keyboard_overlay_dialog_view.cc b/chrome/browser/ui/views/keyboard_overlay_dialog_view.cc
index d2b4075..7da848c 100644
--- a/chrome/browser/ui/views/keyboard_overlay_dialog_view.cc
+++ b/chrome/browser/ui/views/keyboard_overlay_dialog_view.cc
@@ -20,10 +20,6 @@
#include "views/widget/widget.h"
#include "views/window/window.h"
-#if defined(TOOLKIT_USES_GTK)
-#include "views/window/window_gtk.h"
-#endif
-
namespace {
struct Accelerator {
ui::KeyboardCode keycode;
diff --git a/chrome/browser/ui/views/native_constrained_window_win.cc b/chrome/browser/ui/views/native_constrained_window_win.cc
index 134e87b..7ae1e34 100644
--- a/chrome/browser/ui/views/native_constrained_window_win.cc
+++ b/chrome/browser/ui/views/native_constrained_window_win.cc
@@ -4,7 +4,7 @@
#include "chrome/browser/ui/views/constrained_window_views.h"
-#include "views/window/window_win.h"
+#include "views/window/native_window_win.h"
namespace {
bool IsNonClientHitTestCode(UINT hittest) {
@@ -13,10 +13,10 @@ bool IsNonClientHitTestCode(UINT hittest) {
}
class NativeConstrainedWindowWin : public NativeConstrainedWindow,
- public views::WindowWin {
+ public views::NativeWindowWin {
public:
explicit NativeConstrainedWindowWin(NativeConstrainedWindowDelegate* delegate)
- : views::WindowWin(delegate->AsNativeWindowDelegate()),
+ : views::NativeWindowWin(delegate->AsNativeWindowDelegate()),
delegate_(delegate) {
}
@@ -29,17 +29,17 @@ class NativeConstrainedWindowWin : public NativeConstrainedWindow,
return this;
}
- // Overridden from views::WindowWin:
+ // Overridden from views::NativeWindowWin:
virtual void OnFinalMessage(HWND window) OVERRIDE {
delegate_->OnNativeConstrainedWindowDestroyed();
- WindowWin::OnFinalMessage(window);
+ NativeWindowWin::OnFinalMessage(window);
}
virtual LRESULT OnMouseActivate(UINT message,
WPARAM w_param,
LPARAM l_param) OVERRIDE {
if (IsNonClientHitTestCode(static_cast<UINT>(LOWORD(l_param))))
delegate_->OnNativeConstrainedWindowMouseActivate();
- return WindowWin::OnMouseActivate(message, w_param, l_param);
+ return NativeWindowWin::OnMouseActivate(message, w_param, l_param);
}
NativeConstrainedWindowDelegate* delegate_;
generated by cgit v1.1 at 2025-02-28 20:18:08 +0000