Revert 74236 - Mac: Turn on tab overview mode by default.

BUG=50307,72362,76702
TEST=three-finger-swipe down and Window->Tab Overview both open tab overview mode

Review URL: http://codereview.chromium.org/6459009

TBR=thakis@chromium.org
Review URL: http://codereview.chromium.org/6708033

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

6 files changed, 37 insertions, 0 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index ef2d93b..7b729ae 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -4008,6 +4008,12 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_FLAGS_ENABLE" desc="The link for enabling a labs experiment.">
         Enable
       </message>
+      <message name="IDS_FLAGS_TABPOSE_NAME" desc="Name of the 'Tab Overview' lab.">
+        Tab Overview
+      </message>
+      <message name="IDS_FLAGS_TABPOSE_DESCRIPTION" desc="Description of the 'Tab Overview' lab.">
+        Swipe down with three fingers on your trackpad to see an overview of all your tabs. Click on a thumbnail to select it. Works great in fullscreen mode.
+      </message>
       <message name="IDS_FLAGS_MEDIA_PLAYER_NAME" desc="Name of the 'Media Player' lab.">
         Media Player
       </message>
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index b492c49..516b7cf 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -81,6 +81,18 @@ const Experiment::Choice kPagePrerenderChoices[] = {
 // When adding a new choice, add it to the end of the list.
 const Experiment kExperiments[] = {
   {
+    "expose-for-tabs",  // FLAGS:RECORD_UMA
+    IDS_FLAGS_TABPOSE_NAME,
+    IDS_FLAGS_TABPOSE_DESCRIPTION,
+    kOsMac,
+#if defined(OS_MACOSX)
+    // The switch exists only on OS X.
+    SINGLE_VALUE_TYPE(switches::kEnableExposeForTabs)
+#else
+    SINGLE_VALUE_TYPE("")
+#endif
+  },
+  {
     kMediaPlayerExperimentName,
     IDS_FLAGS_MEDIA_PLAYER_NAME,
     IDS_FLAGS_MEDIA_PLAYER_DESCRIPTION,
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm
index eb627ea..b192438 100644
--- a/chrome/browser/app_controller_mac.mm
+++ b/chrome/browser/app_controller_mac.mm
@@ -525,6 +525,11 @@ void RecordLastRunAppBundlePath() {
     [self openUrls:startupUrls_];
     [self clearStartupUrls];
   }
+
+  const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
+  if (!parsed_command_line.HasSwitch(switches::kEnableExposeForTabs)) {
+    [tabposeMenuItem_ setHidden:YES];
+  }
 }
 
 // This is called after profiles have been loaded and preferences registered.
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 1a71300..265d6c9 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -1429,6 +1429,11 @@ void Browser::SelectPreviousTab() {
 
 void Browser::OpenTabpose() {
 #if defined(OS_MACOSX)
+  if (!CommandLine::ForCurrentProcess()->HasSwitch(
+        switches::kEnableExposeForTabs)) {
+    return;
+  }
+
   UserMetrics::RecordAction(UserMetricsAction("OpenTabpose"), profile_);
   window()->OpenTabpose();
 #else
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index b94be3cb..5077c4e 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -1157,6 +1157,11 @@ const char kPasswordStore[]                 = "password-store";
 #endif
 #endif
 
+#if defined(OS_MACOSX)
+// Enables the tabs expose feature ( http://crbug.com/50307 ).
+const char kEnableExposeForTabs[] = "enable-expose-for-tabs";
+#endif
+
 #if !defined(OS_MACOSX)
 // Enable Kiosk mode.
 const char kKioskMode[]                     = "kiosk";
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index b5009ab..b7f8e64 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -334,6 +334,10 @@ extern const char kPasswordStore[];
 #endif
 #endif
 
+#if defined(OS_MACOSX)
+extern const char kEnableExposeForTabs[];
+#endif
+
 #if !defined(OS_MACOSX)
 extern const char kKioskMode[];
 #endif