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/app_list/app_list_controller_ash.h" | 5 #include "chrome/browser/ui/ash/app_list/app_list_controller_ash.h" |
6 | 6 |
7 #include "ash/common/wm_shell.h" | |
8 #include "ash/shelf/shelf_delegate.h" | 7 #include "ash/shelf/shelf_delegate.h" |
9 #include "ash/shell.h" | 8 #include "ash/shell.h" |
| 9 #include "ash/wm_shell.h" |
10 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
11 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" | 11 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" |
12 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_util.h" | 12 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_util.h" |
13 #include "chrome/browser/ui/browser_commands.h" | 13 #include "chrome/browser/ui/browser_commands.h" |
14 #include "chrome/browser/ui/browser_navigator.h" | 14 #include "chrome/browser/ui/browser_navigator.h" |
15 #include "chrome/browser/ui/browser_navigator_params.h" | 15 #include "chrome/browser/ui/browser_navigator_params.h" |
16 #include "extensions/common/extension.h" | 16 #include "extensions/common/extension.h" |
17 #include "ui/app_list/presenter/app_list_presenter_impl.h" | 17 #include "ui/app_list/presenter/app_list_presenter_impl.h" |
18 #include "ui/app_list/views/app_list_view.h" | 18 #include "ui/app_list/views/app_list_view.h" |
19 | 19 |
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
147 AppListSource source) { | 147 AppListSource source) { |
148 switch (source) { | 148 switch (source) { |
149 case LAUNCH_FROM_APP_LIST: | 149 case LAUNCH_FROM_APP_LIST: |
150 return ash::LAUNCH_FROM_APP_LIST; | 150 return ash::LAUNCH_FROM_APP_LIST; |
151 case LAUNCH_FROM_APP_LIST_SEARCH: | 151 case LAUNCH_FROM_APP_LIST_SEARCH: |
152 return ash::LAUNCH_FROM_APP_LIST_SEARCH; | 152 return ash::LAUNCH_FROM_APP_LIST_SEARCH; |
153 default: | 153 default: |
154 return ash::LAUNCH_FROM_UNKNOWN; | 154 return ash::LAUNCH_FROM_UNKNOWN; |
155 } | 155 } |
156 } | 156 } |
OLD | NEW |