Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(666)

Unified Diff: ash/shell/shell_main.cc

Issue 9113045: Reworks the workspace code. Here's the new heuristics: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merged and all that good stuff. Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/ash.gyp ('k') | ash/wm/show_state_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell/shell_main.cc
diff --git a/ash/shell/shell_main.cc b/ash/shell/shell_main.cc
index ea52da8493b2b6fe633df058a3fe7c80cd6171b1..93029909995e58ede9cc7028bd47dde6a0071fea 100644
--- a/ash/shell/shell_main.cc
+++ b/ash/shell/shell_main.cc
@@ -157,7 +157,9 @@ class ShellDelegateImpl : public ash::ShellDelegate {
virtual void LauncherItemClicked(
const ash::LauncherItem& item) OVERRIDE {
- ash::ActivateWindow(watcher_->GetWindowByID(item.id));
+ aura::Window* window = watcher_->GetWindowByID(item.id);
+ window->Show();
+ ash::ActivateWindow(window);
}
virtual int GetBrowserShortcutResourceId() OVERRIDE {
« no previous file with comments | « ash/ash.gyp ('k') | ash/wm/show_state_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698