Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ui / app_list / app_list_switches.cc

diff --git a/src/ui/app_list/app_list_switches.cc b/src/ui/app_list/app_list_switches.cc
index 5ce4e89..ea10c7c 100644 (file)
--- a/src/ui/app_list/app_list_switches.cc
+++ b/src/ui/app_list/app_list_switches.cc
@@ -9,9 +9,18 @@
 namespace app_list {
 namespace switches {
 
+// Specifies the chrome-extension:// URL for the contents of an additional page
+// added to the experimental app launcher.
+const char kCustomLauncherPage[] = "custom-launcher-page";
+
 // If set, the app info context menu item is not available in the app list UI.
 const char kDisableAppInfo[] = "disable-app-list-app-info";
 
+// If set, the app list will not be dismissed when it loses focus. This is
+// useful when testing the app list or a custom launcher page. It can still be
+// dismissed via the other methods (like the Esc key).
+const char kDisableAppListDismissOnBlur[] = "disable-app-list-dismiss-on-blur";
+
 // If set, Drive apps will not be shown side-by-side with Chrome apps.
 const char kDisableDriveAppsInAppList[] = "disable-drive-apps-in-app-list";
 
@@ -72,11 +81,15 @@ bool IsCenteredAppListEnabled() {
          IsExperimentalAppListEnabled();
 }
 
+bool ShouldNotDismissOnBlur() {
+  return CommandLine::ForCurrentProcess()->HasSwitch(
+      kDisableAppListDismissOnBlur);
+}
+
 bool IsDriveAppsInAppListEnabled() {
 #if defined(OS_CHROMEOS)
-  // Disable Drive app integration due to http://crbug.com/420034
-  // TODO(xiyuan): Revisit this after the bug is fixed.
-  return false;
+  return !CommandLine::ForCurrentProcess()->HasSwitch(
+      kDisableDriveAppsInAppList);
 #else
   return false;
 #endif