summaryrefslogtreecommitdiffstats
path: root/chrome/browser/about_flags.cc
diff options
context:
space:
mode:
authorjustinlin@chromium.org <justinlin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-24 23:03:52 +0000
committerjustinlin@chromium.org <justinlin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-24 23:03:52 +0000
commitee99443ee04157e146eea7ef5a2ff8f09567bb01 (patch)
tree0f201b7c5f1dc799ad813f2e877094051207eb09 /chrome/browser/about_flags.cc
parentd1ae69eae6f7fb32bfbfd840bf3ad01f9328938e (diff)
downloadchromium_src-ee99443ee04157e146eea7ef5a2ff8f09567bb01.zip
chromium_src-ee99443ee04157e146eea7ef5a2ff8f09567bb01.tar.gz
chromium_src-ee99443ee04157e146eea7ef5a2ff8f09567bb01.tar.bz2
Revert 163902 - Implement chrome extension tab capture API as specified here:
http://dev.chromium.org/developers/design-documents/extensions/proposed-changes/apis-under-development/webrtc-tab-content-capture BUG=153388 TBR=sky@chromium.org Review URL: https://chromiumcodereview.appspot.com/11038021 TBR=justinlin@chromium.org Review URL: https://codereview.chromium.org/11269020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163948 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/about_flags.cc')
-rw-r--r--chrome/browser/about_flags.cc15
1 files changed, 0 insertions, 15 deletions
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 23dbaa4..b88520b 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -177,14 +177,6 @@ const Experiment::Choice kScriptBubbleChoices[] = {
switches::kScriptBubble, "1"}
};
-const Experiment::Choice kTabCaptureChoices[] = {
- { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
- { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
- switches::kTabCapture, "0"},
- { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
- switches::kTabCapture, "1"}
-};
-
#if defined(OS_CHROMEOS)
const Experiment::Choice kAshBootAnimationFunction[] = {
{ IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
@@ -743,13 +735,6 @@ const Experiment kExperiments[] = {
kOsWin | kOsMac | kOsLinux,
SINGLE_VALUE_TYPE(switches::kEnableTouchEvents)
},
- {
- "enable-tab-capture",
- IDS_ENABLE_TAB_CAPTURE_NAME,
- IDS_ENABLE_TAB_CAPTURE_DESCRIPTION,
- kOsMac | kOsLinux,
- MULTI_VALUE_TYPE(kTabCaptureChoices)
- },
#if defined(OS_CHROMEOS)
{
"enable-background-loader",