summaryrefslogtreecommitdiffstats
path: root/views/window
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-26 23:42:23 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-26 23:42:23 +0000
commit6479c267dd32aab3f043aa2d3b2f808505c031ef (patch)
treeb4c1f5aa25fb119ed28338626e947a7f296a02e3 /views/window
parentb44f5db5391f9865d5950fe88f77dd80e7661ab2 (diff)
downloadchromium_src-6479c267dd32aab3f043aa2d3b2f808505c031ef.zip
chromium_src-6479c267dd32aab3f043aa2d3b2f808505c031ef.tar.gz
chromium_src-6479c267dd32aab3f043aa2d3b2f808505c031ef.tar.bz2
Removes WidgetWin dependency from StatusBubbleViews so that it can compile on Linux.
Requires: - making SetOpacity a cross platform method on Widget, replacing SetLayeredAlpha. - moving Window::SetBounds to Widget - replacing usage of MoveWindow in StatusBubbleViews with call to new SetBounds method. BUG=none TEST=make sure transparency still works for floating widgets like - status bubble, full screen exit bubble, dragged tabs Review URL: http://codereview.chromium.org/113846 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16948 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/window')
-rw-r--r--views/window/window.h10
-rw-r--r--views/window/window_win.cc6
-rw-r--r--views/window/window_win.h3
3 files changed, 6 insertions, 13 deletions
diff --git a/views/window/window.h b/views/window/window.h
index bb618ed..b5a1f56 100644
--- a/views/window/window.h
+++ b/views/window/window.h
@@ -50,12 +50,10 @@ class Window {
// Retrieves the restored bounds for the window.
virtual gfx::Rect GetNormalBounds() const = 0;
- // Sizes and/or places the window to the specified bounds, size or position.
- virtual void SetBounds(const gfx::Rect& bounds) = 0;
-
- // As above, except the window is inserted after |other_window| in the window
- // Z-order. If this window is not yet visible, other_window's monitor is used
- // as the constraining rectangle, rather than this window's monitor.
+ // Sets the Window's bounds. The window is inserted after |other_window| in
+ // the window Z-order. If this window is not yet visible, other_window's
+ // monitor is used as the constraining rectangle, rather than this window's
+ // monitor.
virtual void SetBounds(const gfx::Rect& bounds,
gfx::NativeWindow other_window) = 0;
diff --git a/views/window/window_win.cc b/views/window/window_win.cc
index 2ba4797..3e52871 100644
--- a/views/window/window_win.cc
+++ b/views/window/window_win.cc
@@ -127,10 +127,6 @@ gfx::Rect WindowWin::GetNormalBounds() const {
return gfx::Rect(wp.rcNormalPosition);
}
-void WindowWin::SetBounds(const gfx::Rect& bounds) {
- SetBounds(bounds, NULL);
-}
-
void WindowWin::SetBounds(const gfx::Rect& bounds,
gfx::NativeWindow other_window) {
win_util::SetChildBounds(GetNativeView(), GetParent(), other_window, bounds,
@@ -1213,7 +1209,7 @@ void WindowWin::SetInitialBounds(const gfx::Rect& create_bounds) {
SizeWindowToDefault();
} else {
// Use the supplied initial bounds.
- SetBounds(create_bounds);
+ SetBounds(create_bounds, NULL);
}
}
}
diff --git a/views/window/window_win.h b/views/window/window_win.h
index ddc2f21..5be2319 100644
--- a/views/window/window_win.h
+++ b/views/window/window_win.h
@@ -50,10 +50,9 @@ class WindowWin : public WidgetWin,
focus_on_creation_ = focus_on_creation;
}
- // Window overrides:
+ // Overridden from Window:
virtual gfx::Rect GetBounds() const;
virtual gfx::Rect GetNormalBounds() const;
- virtual void SetBounds(const gfx::Rect& bounds);
virtual void SetBounds(const gfx::Rect& bounds,
gfx::NativeWindow other_window);
virtual void Show();