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

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

Issue 322323002: Only allow ShowAppInfoFlow on Ash and Views platforms (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Actual smaller commit Created 6 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | 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 {
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 bool IsVoiceSearchEnabled() { 48 bool IsVoiceSearchEnabled() {
49 // Speech recognition in AppList is only for ChromeOS right now. 49 // Speech recognition in AppList is only for ChromeOS right now.
50 #if defined(OS_CHROMEOS) 50 #if defined(OS_CHROMEOS)
51 return !CommandLine::ForCurrentProcess()->HasSwitch(kDisableVoiceSearch); 51 return !CommandLine::ForCurrentProcess()->HasSwitch(kDisableVoiceSearch);
52 #else 52 #else
53 return false; 53 return false;
54 #endif 54 #endif
55 } 55 }
56 56
57 bool IsAppInfoEnabled() { 57 bool IsAppInfoEnabled() {
58 #if defined(TOOLKIT_VIEWS)
58 return !CommandLine::ForCurrentProcess()->HasSwitch(kDisableAppInfo); 59 return !CommandLine::ForCurrentProcess()->HasSwitch(kDisableAppInfo);
60 #else
61 return false;
62 #endif
59 } 63 }
60 64
61 bool IsExperimentalAppListEnabled() { 65 bool IsExperimentalAppListEnabled() {
62 return CommandLine::ForCurrentProcess()->HasSwitch( 66 return CommandLine::ForCurrentProcess()->HasSwitch(
63 kEnableExperimentalAppList); 67 kEnableExperimentalAppList);
64 } 68 }
65 69
66 bool IsCenteredAppListEnabled() { 70 bool IsCenteredAppListEnabled() {
67 return CommandLine::ForCurrentProcess()->HasSwitch(kEnableCenteredAppList) || 71 return CommandLine::ForCurrentProcess()->HasSwitch(kEnableCenteredAppList) ||
68 IsExperimentalAppListEnabled(); 72 IsExperimentalAppListEnabled();
69 } 73 }
70 74
71 } // namespace switches 75 } // namespace switches
72 } // namespace app_list 76 } // namespace app_list
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698