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/shelf/shelf_delegate.h" | 7 #include "ash/common/shelf/shelf_delegate.h" |
8 #include "ash/common/wm_shell.h" | 8 #include "ash/common/wm_shell.h" |
9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
10 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
135 void AppListControllerDelegateAsh::ShowForProfileByPath( | 135 void AppListControllerDelegateAsh::ShowForProfileByPath( |
136 const base::FilePath& profile_path) { | 136 const base::FilePath& profile_path) { |
137 // Ash doesn't have profile switching. | 137 // Ash doesn't have profile switching. |
138 NOTREACHED(); | 138 NOTREACHED(); |
139 } | 139 } |
140 | 140 |
141 bool AppListControllerDelegateAsh::ShouldShowUserIcon() { | 141 bool AppListControllerDelegateAsh::ShouldShowUserIcon() { |
142 return false; | 142 return false; |
143 } | 143 } |
144 | 144 |
145 ash::LaunchSource AppListControllerDelegateAsh::AppListSourceToLaunchSource( | 145 ash::ShelfLaunchSource |
| 146 AppListControllerDelegateAsh::AppListSourceToLaunchSource( |
146 AppListSource source) { | 147 AppListSource source) { |
147 switch (source) { | 148 switch (source) { |
148 case LAUNCH_FROM_APP_LIST: | 149 case LAUNCH_FROM_APP_LIST: |
149 return ash::LAUNCH_FROM_APP_LIST; | 150 return ash::LAUNCH_FROM_APP_LIST; |
150 case LAUNCH_FROM_APP_LIST_SEARCH: | 151 case LAUNCH_FROM_APP_LIST_SEARCH: |
151 return ash::LAUNCH_FROM_APP_LIST_SEARCH; | 152 return ash::LAUNCH_FROM_APP_LIST_SEARCH; |
152 default: | 153 default: |
153 return ash::LAUNCH_FROM_UNKNOWN; | 154 return ash::LAUNCH_FROM_UNKNOWN; |
154 } | 155 } |
155 } | 156 } |
OLD | NEW |