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

Side by Side Diff: chrome/browser/ui/ash/launcher/shell_window_launcher_controller.cc

Issue 14222019: Trying to activate a window in a workspace other than the current is ignored while a system modal d… (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 7 years, 8 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/ash/launcher/shell_window_launcher_controller.h" 5 #include "chrome/browser/ui/ash/launcher/shell_window_launcher_controller.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/wm/window_util.h" 8 #include "ash/wm/window_util.h"
9 #include "base/stl_util.h" 9 #include "base/stl_util.h"
10 #include "base/stringprintf.h" 10 #include "base/stringprintf.h"
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 owner_->SetItemStatus(new_controller->launcher_id(), ash::STATUS_ACTIVE); 150 owner_->SetItemStatus(new_controller->launcher_id(), ash::STATUS_ACTIVE);
151 } 151 }
152 152
153 // Mark the old active window's launcher item as running (if different). 153 // Mark the old active window's launcher item as running (if different).
154 ShellWindowLauncherItemController* old_controller = 154 ShellWindowLauncherItemController* old_controller =
155 ControllerForWindow(old_active); 155 ControllerForWindow(old_active);
156 if (old_controller && old_controller != new_controller) 156 if (old_controller && old_controller != new_controller)
157 owner_->SetItemStatus(old_controller->launcher_id(), ash::STATUS_RUNNING); 157 owner_->SetItemStatus(old_controller->launcher_id(), ash::STATUS_RUNNING);
158 } 158 }
159 159
160 void ShellWindowLauncherController::OnWindowActivationRequestCompleted(
161 aura::Window* request_active, aura::Window* actual_active) {
162 }
163
160 // Private Methods 164 // Private Methods
161 165
162 ShellWindowLauncherItemController* 166 ShellWindowLauncherItemController*
163 ShellWindowLauncherController::ControllerForWindow( 167 ShellWindowLauncherController::ControllerForWindow(
164 aura::Window* window) { 168 aura::Window* window) {
165 WindowToAppLauncherIdMap::iterator iter1 = 169 WindowToAppLauncherIdMap::iterator iter1 =
166 window_to_app_launcher_id_map_.find(window); 170 window_to_app_launcher_id_map_.find(window);
167 if (iter1 == window_to_app_launcher_id_map_.end()) 171 if (iter1 == window_to_app_launcher_id_map_.end())
168 return NULL; 172 return NULL;
169 std::string app_launcher_id = iter1->second; 173 std::string app_launcher_id = iter1->second;
170 AppControllerMap::iterator iter2 = app_controller_map_.find(app_launcher_id); 174 AppControllerMap::iterator iter2 = app_controller_map_.find(app_launcher_id);
171 if (iter2 == app_controller_map_.end()) 175 if (iter2 == app_controller_map_.end())
172 return NULL; 176 return NULL;
173 return iter2->second; 177 return iter2->second;
174 } 178 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698