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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
71 kEnableExperimentalAppList); | 71 kEnableExperimentalAppList); |
72 } | 72 } |
73 | 73 |
74 bool IsCenteredAppListEnabled() { | 74 bool IsCenteredAppListEnabled() { |
75 return CommandLine::ForCurrentProcess()->HasSwitch(kEnableCenteredAppList) || | 75 return CommandLine::ForCurrentProcess()->HasSwitch(kEnableCenteredAppList) || |
76 IsExperimentalAppListEnabled(); | 76 IsExperimentalAppListEnabled(); |
77 } | 77 } |
78 | 78 |
79 bool IsDriveAppsInAppListEnabled() { | 79 bool IsDriveAppsInAppListEnabled() { |
80 #if defined(OS_CHROMEOS) | 80 #if defined(OS_CHROMEOS) |
81 return !CommandLine::ForCurrentProcess()->HasSwitch( | 81 // Disable Drive app integration due to http://crbug.com/420034 |
82 kDisableDriveAppsInAppList); | 82 // TODO(xiyuan): Revisit this after the bug is fixed. |
| 83 return false; |
83 #else | 84 #else |
84 return false; | 85 return false; |
85 #endif | 86 #endif |
86 } | 87 } |
87 | 88 |
88 } // namespace switches | 89 } // namespace switches |
89 } // namespace app_list | 90 } // namespace app_list |
OLD | NEW |