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/shell.h" | 8 #include "ash/shell.h" |
9 #include "ash/wm/window_util.h" | 9 #include "ash/wm/window_util.h" |
10 #include "base/stl_util.h" | 10 #include "base/stl_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/ui/ash/launcher/chrome_launcher_controller.h" | 13 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" |
13 #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
" |
14 #include "ui/aura/client/activation_client.h" | 15 #include "ui/aura/client/activation_client.h" |
15 | 16 |
16 using apps::ShellWindow; | 17 using apps::ShellWindow; |
17 | 18 |
18 namespace { | 19 namespace { |
19 | 20 |
20 std::string GetAppLauncherId(ShellWindow* shell_window) { | 21 std::string GetAppLauncherId(ShellWindow* shell_window) { |
21 if (shell_window->window_type_is_panel()) | 22 if (shell_window->window_type_is_panel()) |
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
167 WindowToAppLauncherIdMap::iterator iter1 = | 168 WindowToAppLauncherIdMap::iterator iter1 = |
168 window_to_app_launcher_id_map_.find(window); | 169 window_to_app_launcher_id_map_.find(window); |
169 if (iter1 == window_to_app_launcher_id_map_.end()) | 170 if (iter1 == window_to_app_launcher_id_map_.end()) |
170 return NULL; | 171 return NULL; |
171 std::string app_launcher_id = iter1->second; | 172 std::string app_launcher_id = iter1->second; |
172 AppControllerMap::iterator iter2 = app_controller_map_.find(app_launcher_id); | 173 AppControllerMap::iterator iter2 = app_controller_map_.find(app_launcher_id); |
173 if (iter2 == app_controller_map_.end()) | 174 if (iter2 == app_controller_map_.end()) |
174 return NULL; | 175 return NULL; |
175 return iter2->second; | 176 return iter2->second; |
176 } | 177 } |
OLD | NEW |