Adds a flag for simplified Mac fullscreen.

BUG=None
TEST=Flag has no visible impact.

Review URL: https://chromiumcodereview.appspot.com/16965015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206522 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 17 insertions, 0 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index b2a573d..2a1b4f6 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -7286,6 +7286,12 @@ Keep your key file in a safe place. You will need it to create new versions of y
         <message name="IDS_FLAGS_ENABLE_APP_SHIMS_DESCRIPTION" desc="Description for the flag to enable packaged apps appearing in the dock in OSX.">
           Enables packaged app shortcuts to be added to Applications and to appear in the dock.
         </message>
+        <message name="IDS_FLAGS_ENABLE_SIMPLIFIED_FULLSCREEN_NAME" desc="Title for the flag to enable a simplified Mac fullscreen interface.">
+          Enables simplified fullscreen.
+        </message>
+        <message name="IDS_FLAGS_ENABLE_SIMPLIFIED_FULLSCREEN_DESCRIPTION" desc="Description for the flag to enable a simplified Mac fullscreen interface.">
+          Enables a simplified and improved fullscreen experience on Mac.
+        </message>
       </if>
       <message name="IDS_FLAGS_ENABLE_TRANSLATE_SETTINGS_NAME" desc="Name of the flag to enable translate setting.">
         Enable Translate settings.
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index aece9fd..39655b4 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1481,6 +1481,13 @@ const Experiment kExperiments[] = {
     kOsMac,
     SINGLE_VALUE_TYPE(switches::kEnableAppShims)
   },
+  {
+    "enable-simplified-fullscreen",
+    IDS_FLAGS_ENABLE_SIMPLIFIED_FULLSCREEN_NAME,
+    IDS_FLAGS_ENABLE_SIMPLIFIED_FULLSCREEN_DESCRIPTION,
+    kOsMac,
+    SINGLE_VALUE_TYPE(switches::kEnableSimplifiedFullscreen)
+  },
 #endif
 #if defined(OS_CHROMEOS) || defined(OS_WIN)
   {
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index e757578..33694c5 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -1547,6 +1547,9 @@ const char kEnableAppShims[]                = "enable-app-shims";
 // Enables the tabs expose feature ( http://crbug.com/50307 ).
 const char kEnableExposeForTabs[]           = "enable-expose-for-tabs";
 
+// Enables a simplified fullscreen UI on Mac.
+const char kEnableSimplifiedFullscreen[]    = "enable-simplified-fullscreen";
+
 // Performs Keychain reauthorization from the command line on behalf of a
 // special Keychain reauthorization stub executable. Used during auto-update.
 const char kKeychainReauthorize[]           = "keychain-reauthorize";
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index e50067c..84629d9 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -428,6 +428,7 @@ extern const char kPasswordStore[];
 extern const char kEnableAppListShim[];
 extern const char kEnableAppShims[];
 extern const char kEnableExposeForTabs[];
+extern const char kEnableSimplifiedFullscreen[];
 extern const char kKeychainReauthorize[];
 extern const char kRelauncherProcess[];
 extern const char kUseMockKeychain[];