diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-14 22:52:42 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-14 22:52:42 +0000 |
| commit | ade085b2b879cb8037dfccb979aba22ffebd2be8 (patch) | |
| tree | 9ec38f876b348d6947555b66345333498738d9eb /ui | |
| parent | 31eeab88b5c267ec007fca8c8a708eb65e1995bb (diff) | |
| download | chromium_src-ade085b2b879cb8037dfccb979aba22ffebd2be8.zip chromium_src-ade085b2b879cb8037dfccb979aba22ffebd2be8.tar.gz chromium_src-ade085b2b879cb8037dfccb979aba22ffebd2be8.tar.bz2 | |
Revert 109966 - Grab-bag:
. Avoid trying to layout the desktop when its size is set to 0x0 when minimized on Windows.
. Don't show the "Default Browser" UI in Aura either.
. Don't flash the active window inactive briefly when clicking on launcher items.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/8565015
TBR=ben@chromium.org
Review URL: http://codereview.chromium.org/8564030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109972 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/aura/desktop.cc | 6 | ||||
| -rw-r--r-- | ui/aura/desktop.h | 4 | ||||
| -rw-r--r-- | ui/aura/desktop_host_win.cc | 5 |
3 files changed, 5 insertions, 10 deletions
diff --git a/ui/aura/desktop.cc b/ui/aura/desktop.cc index 58eaec2e..010acf4 100644 --- a/ui/aura/desktop.cc +++ b/ui/aura/desktop.cc @@ -323,14 +323,12 @@ void Desktop::OnHostResized(const gfx::Size& size) { } void Desktop::SetActiveWindow(Window* window, Window* to_focus) { - if (!window) - return; // The stacking client may impose rules on what window configurations can be // activated or deactivated. - if (!stacking_client_->CanActivateWindow(window)) + if (window && !stacking_client_->CanActivateWindow(window)) return; // The window may not be activate-able. - if (!window->CanActivate()) + if (window && !window->CanActivate()) return; // Nothing may actually have changed. if (active_window_ == window) diff --git a/ui/aura/desktop.h b/ui/aura/desktop.h index 10e7f64..8ba752a 100644 --- a/ui/aura/desktop.h +++ b/ui/aura/desktop.h @@ -96,8 +96,8 @@ class AURA_EXPORT Desktop : public ui::CompositorDelegate, void OnHostResized(const gfx::Size& size); // Sets the active window to |window| and the focused window to |to_focus|. - // If |to_focus| is NULL, |window| is focused. Does nothing if |window| is - // NULL. + // If |to_focus| is NULL, |window| is focused. + // |window| can be NULL. void SetActiveWindow(Window* window, Window* to_focus); // Activates the topmost window. Does nothing if the topmost window is already diff --git a/ui/aura/desktop_host_win.cc b/ui/aura/desktop_host_win.cc index c491ac1..8928ef2 100644 --- a/ui/aura/desktop_host_win.cc +++ b/ui/aura/desktop_host_win.cc @@ -258,10 +258,7 @@ void DesktopHostWin::OnPaint(HDC dc) { } void DesktopHostWin::OnSize(UINT param, const CSize& size) { - // Minimizing resizes the window to 0x0 which causes our layout to go all - // screwy, so we just ignore it. - if (param != SIZE_MINIMIZED) - desktop_->OnHostResized(gfx::Size(size.cx, size.cy)); + desktop_->OnHostResized(gfx::Size(size.cx, size.cy)); } } // namespace aura |