OLD | NEW |
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 19 matching lines...) Expand all Loading... |
30 | 30 |
31 bool IsAppListSyncEnabled() { | 31 bool IsAppListSyncEnabled() { |
32 #if defined(OS_CHROMEOS) | 32 #if defined(OS_CHROMEOS) |
33 return !CommandLine::ForCurrentProcess()->HasSwitch(kDisableSyncAppList); | 33 return !CommandLine::ForCurrentProcess()->HasSwitch(kDisableSyncAppList); |
34 #else | 34 #else |
35 return CommandLine::ForCurrentProcess()->HasSwitch(kEnableSyncAppList); | 35 return CommandLine::ForCurrentProcess()->HasSwitch(kEnableSyncAppList); |
36 #endif | 36 #endif |
37 } | 37 } |
38 | 38 |
39 bool IsFolderUIEnabled() { | 39 bool IsFolderUIEnabled() { |
| 40 return true; |
40 #if defined(OS_MACOSX) | 41 #if defined(OS_MACOSX) |
41 return false; // Folder UI not implemented for OSX | 42 return false; // Folder UI not implemented for OSX |
42 #endif | 43 #endif |
43 // Folder UI is available only when AppList sync is enabled, and should | 44 // Folder UI is available only when AppList sync is enabled, and should |
44 // not be disabled separately. | 45 // not be disabled separately. |
45 return IsAppListSyncEnabled(); | 46 return IsAppListSyncEnabled(); |
46 } | 47 } |
47 | 48 |
48 bool IsVoiceSearchEnabled() { | 49 bool IsVoiceSearchEnabled() { |
49 // Speech recognition in AppList is only for ChromeOS right now. | 50 // Speech recognition in AppList is only for ChromeOS right now. |
(...skipping 14 matching lines...) Expand all Loading... |
64 } | 65 } |
65 | 66 |
66 bool IsExperimentalAppListPositionEnabled() { | 67 bool IsExperimentalAppListPositionEnabled() { |
67 return CommandLine::ForCurrentProcess()->HasSwitch( | 68 return CommandLine::ForCurrentProcess()->HasSwitch( |
68 kEnableExperimentalAppListPosition) || | 69 kEnableExperimentalAppListPosition) || |
69 IsExperimentalAppListEnabled(); | 70 IsExperimentalAppListEnabled(); |
70 } | 71 } |
71 | 72 |
72 } // namespace switches | 73 } // namespace switches |
73 } // namespace app_list | 74 } // namespace app_list |
OLD | NEW |