Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(530)

Side by Side Diff: chrome/browser/ui/ash/app_list/app_list_controller_ash.cc

Issue 2808723004: Renames WmShell to ShellPort (Closed)
Patch Set: feedback Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/shelf/shelf_delegate.h" 7 #include "ash/shelf/shelf_delegate.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ash/wm_shell.h"
10 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
11 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" 10 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
12 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_util.h" 11 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_util.h"
13 #include "chrome/browser/ui/browser_commands.h" 12 #include "chrome/browser/ui/browser_commands.h"
14 #include "chrome/browser/ui/browser_navigator.h" 13 #include "chrome/browser/ui/browser_navigator.h"
15 #include "chrome/browser/ui/browser_navigator_params.h" 14 #include "chrome/browser/ui/browser_navigator_params.h"
16 #include "extensions/common/extension.h" 15 #include "extensions/common/extension.h"
17 #include "ui/app_list/presenter/app_list_presenter_impl.h" 16 #include "ui/app_list/presenter/app_list_presenter_impl.h"
18 #include "ui/app_list/views/app_list_view.h" 17 #include "ui/app_list/views/app_list_view.h"
19 18
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 AppListSource source) { 126 AppListSource source) {
128 switch (source) { 127 switch (source) {
129 case LAUNCH_FROM_APP_LIST: 128 case LAUNCH_FROM_APP_LIST:
130 return ash::LAUNCH_FROM_APP_LIST; 129 return ash::LAUNCH_FROM_APP_LIST;
131 case LAUNCH_FROM_APP_LIST_SEARCH: 130 case LAUNCH_FROM_APP_LIST_SEARCH:
132 return ash::LAUNCH_FROM_APP_LIST_SEARCH; 131 return ash::LAUNCH_FROM_APP_LIST_SEARCH;
133 default: 132 default:
134 return ash::LAUNCH_FROM_UNKNOWN; 133 return ash::LAUNCH_FROM_UNKNOWN;
135 } 134 }
136 } 135 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698