summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/app/generated_resources.grd6
-rw-r--r--chrome/browser/about_flags.cc12
-rw-r--r--chrome/browser/app_controller_mac.mm5
-rw-r--r--chrome/browser/ui/browser.cc5
-rw-r--r--chrome/common/chrome_switches.cc3
-rw-r--r--chrome/common/chrome_switches.h1
6 files changed, 0 insertions, 32 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 1708b7f..c64870f 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -3948,12 +3948,6 @@ 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 8386677..e755ee9 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -70,18 +70,6 @@ const char kVerticalTabsExperimentName[] = "vertical-tabs";
// 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 87642af..cf49d4a 100644
--- a/chrome/browser/app_controller_mac.mm
+++ b/chrome/browser/app_controller_mac.mm
@@ -609,11 +609,6 @@ 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 868d586..61a3803 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -1396,11 +1396,6 @@ 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 95aa721..a798bde 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -1358,9 +1358,6 @@ const char kPasswordStore[] = "password-store";
// has been out there for a few dev channel releases without problems.
const char kDisableHolePunching[] = "disable-hole-punching";
-// Enables the tabs expose feature ( http://crbug.com/50307 ).
-const char kEnableExposeForTabs[] = "enable-expose-for-tabs";
-
// Cause the OS X sandbox write to syslog every time an access to a resource
// is denied by the sandbox.
const char kEnableSandboxLogging[] = "enable-sandbox-logging";
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index d776b0e..0e67fa1 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -390,7 +390,6 @@ extern const char kPasswordStore[];
#if defined(OS_MACOSX)
extern const char kDisableHolePunching[];
-extern const char kEnableExposeForTabs[];
extern const char kEnableSandboxLogging[];
#else
extern const char kKioskMode[];