diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-14 22:32:55 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-14 22:32:55 +0000 |
| commit | e444c8ac8893a6e1f0f20bbf9b068e39652b7642 (patch) | |
| tree | 4a8b7617c96ba1e13715190ee17f067070314f67 /ui/aura/desktop.cc | |
| parent | 010882ff6f4a6a624d1e6eb822f4baf2856a8752 (diff) | |
| download | chromium_src-e444c8ac8893a6e1f0f20bbf9b068e39652b7642.zip chromium_src-e444c8ac8893a6e1f0f20bbf9b068e39652b7642.tar.gz chromium_src-e444c8ac8893a6e1f0f20bbf9b068e39652b7642.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109966 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/desktop.cc')
| -rw-r--r-- | ui/aura/desktop.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ui/aura/desktop.cc b/ui/aura/desktop.cc index 010acf4..58eaec2e 100644 --- a/ui/aura/desktop.cc +++ b/ui/aura/desktop.cc @@ -323,12 +323,14 @@ 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 (window && !stacking_client_->CanActivateWindow(window)) + if (!stacking_client_->CanActivateWindow(window)) return; // The window may not be activate-able. - if (window && !window->CanActivate()) + if (!window->CanActivate()) return; // Nothing may actually have changed. if (active_window_ == window) |