OLD | NEW |
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 "apps/shell_window.h" | 7 #include "apps/shell_window.h" |
8 #include "ash/shelf/shelf_util.h" | 8 #include "ash/shelf/shelf_util.h" |
9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
10 #include "ash/wm/window_util.h" | 10 #include "ash/wm/window_util.h" |
11 #include "base/strings/stringprintf.h" | 11 #include "base/strings/stringprintf.h" |
12 #include "chrome/browser/profiles/profile.h" | 12 #include "chrome/browser/profiles/profile.h" |
13 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" | 13 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" |
14 #include "chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.h
" | 14 #include "chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.h
" |
15 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h" | 15 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h" |
16 #include "chrome/browser/ui/host_desktop.h" | 16 #include "chrome/browser/ui/host_desktop.h" |
| 17 #include "extensions/common/extension.h" |
17 #include "ui/aura/client/activation_client.h" | 18 #include "ui/aura/client/activation_client.h" |
18 #include "ui/aura/root_window.h" | 19 #include "ui/aura/root_window.h" |
19 | 20 |
20 using apps::ShellWindow; | 21 using apps::ShellWindow; |
21 | 22 |
22 namespace { | 23 namespace { |
23 | 24 |
24 std::string GetAppLauncherId(ShellWindow* shell_window) { | 25 std::string GetAppLauncherId(ShellWindow* shell_window) { |
25 if (shell_window->window_type_is_panel()) | 26 if (shell_window->window_type_is_panel()) |
26 return base::StringPrintf("panel:%d", shell_window->session_id().id()); | 27 return base::StringPrintf("panel:%d", shell_window->session_id().id()); |
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
214 WindowToAppLauncherIdMap::iterator iter1 = | 215 WindowToAppLauncherIdMap::iterator iter1 = |
215 window_to_app_launcher_id_map_.find(window); | 216 window_to_app_launcher_id_map_.find(window); |
216 if (iter1 == window_to_app_launcher_id_map_.end()) | 217 if (iter1 == window_to_app_launcher_id_map_.end()) |
217 return NULL; | 218 return NULL; |
218 std::string app_launcher_id = iter1->second; | 219 std::string app_launcher_id = iter1->second; |
219 AppControllerMap::iterator iter2 = app_controller_map_.find(app_launcher_id); | 220 AppControllerMap::iterator iter2 = app_controller_map_.find(app_launcher_id); |
220 if (iter2 == app_controller_map_.end()) | 221 if (iter2 == app_controller_map_.end()) |
221 return NULL; | 222 return NULL; |
222 return iter2->second; | 223 return iter2->second; |
223 } | 224 } |
OLD | NEW |