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

Side by Side Diff: ui/app_list/app_list_switches.cc

Issue 1206163002: Remove chrome://flags/#enable-app-list, move kEnableAppList to app_list:: (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 5 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
« no previous file with comments | « ui/app_list/app_list_switches.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "ui/app_list/app_list_switches.h" 5 #include "ui/app_list/app_list_switches.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 8
9 namespace app_list { 9 namespace app_list {
10 namespace switches { 10 namespace switches {
11 11
12 // Specifies the chrome-extension:// URL for the contents of an additional page 12 // Specifies the chrome-extension:// URL for the contents of an additional page
13 // added to the experimental app launcher. 13 // added to the experimental app launcher.
14 const char kCustomLauncherPage[] = "custom-launcher-page"; 14 const char kCustomLauncherPage[] = "custom-launcher-page";
15 15
16 // If set, the app list will not be dismissed when it loses focus. This is 16 // If set, the app list will not be dismissed when it loses focus. This is
17 // useful when testing the app list or a custom launcher page. It can still be 17 // useful when testing the app list or a custom launcher page. It can still be
18 // dismissed via the other methods (like the Esc key). 18 // dismissed via the other methods (like the Esc key).
19 const char kDisableAppListDismissOnBlur[] = "disable-app-list-dismiss-on-blur"; 19 const char kDisableAppListDismissOnBlur[] = "disable-app-list-dismiss-on-blur";
20 20
21 // If set, Drive apps will not be shown side-by-side with Chrome apps. 21 // If set, Drive apps will not be shown side-by-side with Chrome apps.
22 const char kDisableDriveAppsInAppList[] = "disable-drive-apps-in-app-list"; 22 const char kDisableDriveAppsInAppList[] = "disable-drive-apps-in-app-list";
23 23
24 // If set, the app list will be enabled as if enabled from CWS.
25 const char kEnableAppList[] = "enable-app-list";
26
24 // If set, the app list will be centered and wide instead of tall. 27 // If set, the app list will be centered and wide instead of tall.
25 const char kEnableCenteredAppList[] = "enable-centered-app-list"; 28 const char kEnableCenteredAppList[] = "enable-centered-app-list";
26 29
27 // Enable/disable the experimental app list. If enabled, implies 30 // Enable/disable the experimental app list. If enabled, implies
28 // --enable-centered-app-list. 31 // --enable-centered-app-list.
29 const char kEnableExperimentalAppList[] = "enable-experimental-app-list"; 32 const char kEnableExperimentalAppList[] = "enable-experimental-app-list";
30 const char kDisableExperimentalAppList[] = "disable-experimental-app-list"; 33 const char kDisableExperimentalAppList[] = "disable-experimental-app-list";
31 34
32 // Enable/disable syncing of the app list independent of extensions. 35 // Enable/disable syncing of the app list independent of extensions.
33 const char kEnableSyncAppList[] = "enable-sync-app-list"; 36 const char kEnableSyncAppList[] = "enable-sync-app-list";
34 const char kDisableSyncAppList[] = "disable-sync-app-list"; 37 const char kDisableSyncAppList[] = "disable-sync-app-list";
35 38
36 // Enables launcher search provider api. 39 // Enables launcher search provider api.
37 const char kEnableLauncherSearchProviderApi[] = 40 const char kEnableLauncherSearchProviderApi[] =
38 "enable-launcher-search-provider-api"; 41 "enable-launcher-search-provider-api";
39 42
40 // Enable/disable the new "blended" algorithm in app_list::Mixer. This is just 43 // Enable/disable the new "blended" algorithm in app_list::Mixer. This is just
41 // forcing the AppListMixer/Blended field trial. 44 // forcing the AppListMixer/Blended field trial.
42 const char kEnableNewAppListMixer[] = "enable-new-app-list-mixer"; 45 const char kEnableNewAppListMixer[] = "enable-new-app-list-mixer";
43 const char kDisableNewAppListMixer[] = "disable-new-app-list-mixer"; 46 const char kDisableNewAppListMixer[] = "disable-new-app-list-mixer";
44 47
48 // If set, the app list will forget it has been installed on startup. Note this
49 // doesn't prevent the app list from running, it just makes Chrome think the app
50 // list hasn't been enabled (as in kEnableAppList) yet.
51 const char kResetAppListInstallState[] = "reset-app-list-install-state";
52
45 #if defined(OS_MACOSX) 53 #if defined(OS_MACOSX)
46 // Enables use of the toolkit-views app list on Mac. 54 // Enables use of the toolkit-views app list on Mac.
47 const char kEnableMacViewsAppList[] = "enable-mac-views-app-list"; 55 const char kEnableMacViewsAppList[] = "enable-mac-views-app-list";
48 #endif 56 #endif
49 57
50 bool IsAppListSyncEnabled() { 58 bool IsAppListSyncEnabled() {
51 #if defined(OS_MACOSX) 59 #if defined(OS_MACOSX)
52 if (base::CommandLine::ForCurrentProcess()->HasSwitch(kEnableSyncAppList)) 60 if (base::CommandLine::ForCurrentProcess()->HasSwitch(kEnableSyncAppList))
53 return true; 61 return true;
54 62
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 #if defined(TOOLKIT_VIEWS) 132 #if defined(TOOLKIT_VIEWS)
125 return base::CommandLine::ForCurrentProcess()->HasSwitch( 133 return base::CommandLine::ForCurrentProcess()->HasSwitch(
126 kEnableMacViewsAppList); 134 kEnableMacViewsAppList);
127 #endif 135 #endif
128 return false; 136 return false;
129 } 137 }
130 #endif // defined(OS_MACOSX) 138 #endif // defined(OS_MACOSX)
131 139
132 } // namespace switches 140 } // namespace switches
133 } // namespace app_list 141 } // namespace app_list
OLDNEW
« no previous file with comments | « ui/app_list/app_list_switches.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698