diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-29 19:40:09 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-29 19:40:09 +0000 |
| commit | c2ab7327dc1fa24ec753b098e1e902b1bab4d936 (patch) | |
| tree | 2c93e57fbbed199632daf53f5136eecb1a20c6a8 /chrome/views/window | |
| parent | 4309aee5e93a20a7dbc438a762caf94ffb0aed11 (diff) | |
| download | chromium_src-c2ab7327dc1fa24ec753b098e1e902b1bab4d936.zip chromium_src-c2ab7327dc1fa24ec753b098e1e902b1bab4d936.tar.gz chromium_src-c2ab7327dc1fa24ec753b098e1e902b1bab4d936.tar.bz2 | |
Two changes:
. Removes MoveToFront on Widget.
. CHanges AsWindow to GetWindow.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/99133
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14868 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/views/window')
| -rw-r--r-- | chrome/views/window/non_client_view.cc | 2 | ||||
| -rw-r--r-- | chrome/views/window/window_win.cc | 1 | ||||
| -rw-r--r-- | chrome/views/window/window_win.h | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/chrome/views/window/non_client_view.cc b/chrome/views/window/non_client_view.cc index 29daf06..9402adf 100644 --- a/chrome/views/window/non_client_view.cc +++ b/chrome/views/window/non_client_view.cc @@ -191,7 +191,7 @@ views::View* NonClientView::GetViewForPoint(const gfx::Point& point, bool NonClientFrameView::HitTest(const gfx::Point& l) const { // For the default case, we assume the non-client frame view never overlaps // the client view. - return !GetWidget()->AsWindow()->GetClientView()->bounds().Contains(l); + return !GetWidget()->GetWindow()->GetClientView()->bounds().Contains(l); } void NonClientFrameView::DidChangeBounds(const gfx::Rect& previous, diff --git a/chrome/views/window/window_win.cc b/chrome/views/window/window_win.cc index 8c03219..8a53e2f 100644 --- a/chrome/views/window/window_win.cc +++ b/chrome/views/window/window_win.cc @@ -467,6 +467,7 @@ WindowWin::WindowWin(WindowDelegate* window_delegate) ignore_pos_changes_factory_(this), force_hidden_count_(0), last_monitor_(NULL) { + is_window_ = true; InitClass(); DCHECK(window_delegate_); window_delegate_->window_.reset(this); diff --git a/chrome/views/window/window_win.h b/chrome/views/window/window_win.h index 222ac52..239e17e 100644 --- a/chrome/views/window/window_win.h +++ b/chrome/views/window/window_win.h @@ -147,8 +147,8 @@ class WindowWin : public WidgetWin, virtual void OnSize(UINT size_param, const CSize& new_size); virtual void OnSysCommand(UINT notification_code, CPoint click); virtual void OnWindowPosChanging(WINDOWPOS* window_pos); - virtual Window* AsWindow() { return this; } - virtual const Window* AsWindow() const { return this; } + virtual Window* GetWindow() { return this; } + virtual const Window* GetWindow() const { return this; } // Accessor for disable_inactive_rendering_. bool disable_inactive_rendering() const { |