OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/app_window_launcher_controller.h" | 5 #include "chrome/browser/ui/ash/launcher/app_window_launcher_controller.h" |
6 | 6 |
7 #include "ash/shelf/shelf_util.h" | 7 #include "ash/shelf/shelf_util.h" |
8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
9 #include "ash/wm/window_util.h" | 9 #include "ash/wm/window_util.h" |
10 #include "base/strings/stringprintf.h" | 10 #include "base/strings/stringprintf.h" |
11 #include "chrome/browser/profiles/profile.h" | 11 #include "chrome/browser/profiles/profile.h" |
12 #include "chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.h" | 12 #include "chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.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/multi_user/multi_user_window_manager.h" | 14 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h" |
15 #include "chrome/browser/ui/host_desktop.h" | 15 #include "chrome/browser/ui/host_desktop.h" |
16 #include "extensions/browser/app_window/app_window.h" | 16 #include "extensions/browser/app_window/app_window.h" |
17 #include "extensions/common/extension.h" | 17 #include "extensions/common/extension.h" |
18 #include "ui/aura/window_event_dispatcher.h" | 18 #include "ui/aura/window_event_dispatcher.h" |
| 19 #include "ui/gfx/host_desktop_type.h" |
19 #include "ui/wm/public/activation_client.h" | 20 #include "ui/wm/public/activation_client.h" |
20 | 21 |
21 using extensions::AppWindow; | 22 using extensions::AppWindow; |
22 using extensions::AppWindowRegistry; | 23 using extensions::AppWindowRegistry; |
23 | 24 |
24 namespace { | 25 namespace { |
25 | 26 |
26 std::string GetAppShelfId(AppWindow* app_window) { | 27 std::string GetAppShelfId(AppWindow* app_window) { |
27 if (app_window->window_type_is_panel()) | 28 if (app_window->window_type_is_panel()) |
28 return base::StringPrintf("panel:%d", app_window->session_id().id()); | 29 return base::StringPrintf("panel:%d", app_window->session_id().id()); |
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
235 WindowToAppShelfIdMap::iterator iter1 = | 236 WindowToAppShelfIdMap::iterator iter1 = |
236 window_to_app_shelf_id_map_.find(window); | 237 window_to_app_shelf_id_map_.find(window); |
237 if (iter1 == window_to_app_shelf_id_map_.end()) | 238 if (iter1 == window_to_app_shelf_id_map_.end()) |
238 return NULL; | 239 return NULL; |
239 std::string app_shelf_id = iter1->second; | 240 std::string app_shelf_id = iter1->second; |
240 AppControllerMap::iterator iter2 = app_controller_map_.find(app_shelf_id); | 241 AppControllerMap::iterator iter2 = app_controller_map_.find(app_shelf_id); |
241 if (iter2 == app_controller_map_.end()) | 242 if (iter2 == app_controller_map_.end()) |
242 return NULL; | 243 return NULL; |
243 return iter2->second; | 244 return iter2->second; |
244 } | 245 } |
OLD | NEW |