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

chrome/app/generated_resources.grd

 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
 This file contains definitions of resources that will be translated for each
 locale.  The variables is_win, is_macosx, is_linux, and is_posix are available
 for making strings OS specific.  Other platform defines such as use_titlecase
 are declared in build/common.gypi.
 -->
 
 <grit base_dir="." latest_public_release="0" current_release="1"
@@ skipping 5003 matching lines @@
       </message>
       <message name="IDS_FLAGS_ENABLE_EXTENSION_ALERTS_DESCRIPTION" desc="Description for the flag to enable extension alerts.">
         Enable various alerts about changes in extension state.
       </message>
       <message name="IDS_FLAGS_ENABLE_MEDIA_SOURCE_NAME" desc="Title for the flag to enable the Media Source API on &lt;video&gt; elements.">
         Enable Media Source API on <ph name="VIDEO_HTML">&lt;video&gt;</ph> elements.
       </message>
       <message name="IDS_FLAGS_ENABLE_MEDIA_SOURCE_DESCRIPTION" desc="Description for the flag to enable the Media Source API on &lt;video&gt; elements.">
         Enable experimental Media Source API on the video elements. This API allows JavaScript to send media data directly to a video element.
       </message>
-      <message name="IDS_FLAGS_AURA_WORKSPACE_MANAGER_NAME" desc="Title for flag for workspace manager window dragging.">
-        Workspace manager
-      </message>
-      <message name="IDS_FLAGS_AURA_WORKSPACE_MANAGER_DESCRIPTION" desc="Description for flag for workspace manager window dragging.">
-        Enable multiple workspaces and smart window sizing and dragging.
-      </message>
       <message name="IDS_FLAGS_AURA_TRANSLUCENT_FRAMES_NAME" desc="Title for the flag to enable fancy translucent windows.">
         Translucent windows
       </message>
       <message name="IDS_FLAGS_AURA_TRANSLUCENT_FRAMES_DESCRIPTION" desc="Description for the flag to enable fancy translucent windows.">
         Enable translucent window frames.
       </message>
       <message name="IDS_FLAGS_AURA_GOOGLE_DIALOG_FRAMES_NAME" desc="Title for the flag to enable Google-style dialog frames.">
         Google-style dialogs
       </message>
       <message name="IDS_FLAGS_AURA_GOOGLE_DIALOG_FRAMES_DESCRIPTION" desc="Description for the flag to enable Google-style dialog frames.">
         Enable Google-style dialog frames.
       </message>
       <message name="IDS_FLAGS_ENABLE_POINTER_LOCK_NAME" desc="Title for the flag to enable the pointer lock feature.">
         Enable Pointer Lock
       </message>
       <message name="IDS_FLAGS_ENABLE_POINTER_LOCK_DESCRIPTION" desc="Description for the flag to enable the mouse lock feature.">
         Web pages may capture the mouse pointer and remove it from the user's control. The mouse movement data is directed solely to the web application. Users can escape by pressing the 'Esc' key.
       </message>
       <message name="IDS_FLAGS_AURA_WINDOW_MODE_NAME" desc="Title for flag to choose how windows are displayed.">
         Window mode
       </message>
       <message name="IDS_FLAGS_AURA_WINDOW_MODE_DESCRIPTION" desc="Description for the flag to choose how windows are displayed.">
-        Normal mode shows draggable windows.  Compact mode shows a single maximized window, useful for low-resolution devices such as laptops.
+        Compact mode shows a single maximized window, useful for low-resolution devices such as laptops. Managed mode automatically arranges windows. Overlapping window mode shows traditional draggable windows.
       </message>
       <message name="IDS_FLAGS_AURA_WINDOW_MODE_AUTOMATIC" desc="Option name for automatic selection of window display mode.">
         Automatic
       </message>
-      <message name="IDS_FLAGS_AURA_WINDOW_MODE_NORMAL" desc="Option name for normal window display mode.">
-        Normal
-      </message>
       <message name="IDS_FLAGS_AURA_WINDOW_MODE_COMPACT" desc="Option name for compact/low-resolution window display mode.">
         Compact
       </message>
+      <message name="IDS_FLAGS_AURA_WINDOW_MODE_MANAGED" desc="Option name for automatically managed window display mode.">
+        Managed
+      </message>
+      <message name="IDS_FLAGS_AURA_WINDOW_MODE_OVERLAPPING" desc="Option name for overlapping window display mode.">
+        Overlapping
+      </message>
       <message name="IDS_FLAGS_ENABLE_PLATFORM_APPS_NAME" desc="Title for the flag to enable platform apps.">
         Enable platform apps
       </message>
       <message name="IDS_FLAGS_ENABLE_PLATFORM_APPS_DESCRIPTION" desc="Description for the flag to enable platform apps.">
         Enable advanced application capabilities.
       </message>
       <message name="IDS_FLAGS_ENABLE_GAMEPAD_NAME" desc="Title for the flag to enable gamepad support.">
         Enable Gamepad
       </message>
       <message name="IDS_FLAGS_ENABLE_GAMEPAD_DESCRIPTION" desc="Description for the flag to enable gamepad support.">
@@ skipping 9922 matching lines @@
     </messages>
     <structures fallback_to_english="true">
       <!-- Make sure these stay in sync with the structures in generated_resources.grd. -->
       <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type="dialog" >
       </structure>
       <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" type="dialog" >
       </structure>
     </structures>
   </release>
 </grit>