Aura: Rework window mode flags to compact/overlapping/managed

chrome/browser/about_flags.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/about_flags.h"
 
 #include <algorithm>
 #include <iterator>
 #include <map>
 #include <set>
@@ skipping 70 matching lines @@
     switches::kOmniboxAggressiveHistoryURL,
     switches::kOmniboxAggressiveHistoryURLEnabled },
   { IDS_FLAGS_OMNIBOX_AGGRESSIVE_HISTORY_URL_SCORING_DISABLED,
     switches::kOmniboxAggressiveHistoryURL,
     switches::kOmniboxAggressiveHistoryURLDisabled }
 };
 
 #if defined(USE_AURA)
 const Experiment::Choice kAuraWindowModeChoices[] = {
   { IDS_FLAGS_AURA_WINDOW_MODE_AUTOMATIC, "", "" },
-  { IDS_FLAGS_AURA_WINDOW_MODE_NORMAL,
-      ash::switches::kAuraWindowMode, ash::switches::kAuraWindowModeNormal },
   { IDS_FLAGS_AURA_WINDOW_MODE_COMPACT,
-      ash::switches::kAuraWindowMode, ash::switches::kAuraWindowModeCompact }
+      ash::switches::kAuraWindowMode,
+      ash::switches::kAuraWindowModeCompact },
+  { IDS_FLAGS_AURA_WINDOW_MODE_MANAGED,
+      ash::switches::kAuraWindowMode,
+      ash::switches::kAuraWindowModeManaged },
+  { IDS_FLAGS_AURA_WINDOW_MODE_OVERLAPPING,
+      ash::switches::kAuraWindowMode,
+      ash::switches::kAuraWindowModeOverlapping },
 };
 #endif
 
 // RECORDING USER METRICS FOR FLAGS:
 // -----------------------------------------------------------------------------
 // The first line of the experiment is the internal name. If you'd like to
 // gather statistics about the usage of your flag, you should append a marker
 // comment to the end of the feature name, like so:
 //   "my-special-feature",  // FLAGS:RECORD_UMA
 //
@@ skipping 353 matching lines @@
   },
   {
     "enable-pointer-lock",
     IDS_FLAGS_ENABLE_POINTER_LOCK_NAME,
     IDS_FLAGS_ENABLE_POINTER_LOCK_DESCRIPTION,
     kOsAll,
     SINGLE_VALUE_TYPE(switches::kEnablePointerLock)
   },
 #if defined(USE_AURA)
   {
-    "aura-workspace-manager",
-    IDS_FLAGS_AURA_WORKSPACE_MANAGER_NAME,
-    IDS_FLAGS_AURA_WORKSPACE_MANAGER_DESCRIPTION,
-    kOsWin | kOsLinux | kOsCrOS,
-    SINGLE_VALUE_TYPE(ash::switches::kAuraWorkspaceManager)
-  },
-  {
     "aura-translucent-frames",
     IDS_FLAGS_AURA_TRANSLUCENT_FRAMES_NAME,
     IDS_FLAGS_AURA_TRANSLUCENT_FRAMES_DESCRIPTION,
     kOsWin | kOsLinux | kOsCrOS,
     SINGLE_VALUE_TYPE(ash::switches::kAuraTranslucentFrames)
   },
   {
     "aura-google-dialog-frames",
     IDS_FLAGS_AURA_GOOGLE_DIALOG_FRAMES_NAME,
     IDS_FLAGS_AURA_GOOGLE_DIALOG_FRAMES_DESCRIPTION,
     kOsWin | kOsLinux | kOsCrOS,
     SINGLE_VALUE_TYPE(ash::switches::kAuraGoogleDialogFrames)
   },
-  // TODO(jamescook): Enable this for all ChromeOS builds when we're sure
-  // Aura laptop mode performance and feature set match traditional non-Aura
-  // builds.
   {
     "aura-window-mode",
     IDS_FLAGS_AURA_WINDOW_MODE_NAME,
     IDS_FLAGS_AURA_WINDOW_MODE_DESCRIPTION,
     kOsWin | kOsLinux | kOsCrOS,
     MULTI_VALUE_TYPE(kAuraWindowModeChoices)
   },
 #endif  // defined(USE_AURA)
   {
     "enable-gamepad",
@@ skipping 504 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags