diff options
| author | annacc@chromium.org <annacc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-07 21:33:16 +0000 |
|---|---|---|
| committer | annacc@chromium.org <annacc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-07 21:33:16 +0000 |
| commit | b65169079505f1065ba4371900e0471cf9f2fb71 (patch) | |
| tree | 4f07c1c632dad6872ece7f0e0076777b8e5d31f1 /content | |
| parent | c2dad2976730464242e1b89edd6db17163a5fa02 (diff) | |
| download | chromium_src-b65169079505f1065ba4371900e0471cf9f2fb71.zip chromium_src-b65169079505f1065ba4371900e0471cf9f2fb71.tar.gz chromium_src-b65169079505f1065ba4371900e0471cf9f2fb71.tar.bz2 | |
Update the text for disabling the track element in chrome://flags
The text for disabling the track element in chrome://flags is confusing
BUG=146788
Review URL: https://chromiumcodereview.appspot.com/10908124
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155486 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/renderer_host/render_process_host_impl.cc | 1 | ||||
| -rw-r--r-- | content/public/common/content_switches.cc | 3 | ||||
| -rw-r--r-- | content/public/common/content_switches.h | 1 | ||||
| -rw-r--r-- | content/renderer/render_thread_impl.cc | 3 |
4 files changed, 0 insertions, 8 deletions
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc index b598c27..4f7c624 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -754,7 +754,6 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( switches::kDisableSpeechInput, switches::kEnableScriptedSpeech, switches::kDisableThreadedAnimation, - switches::kDisableVideoTrack, #if defined(OS_ANDROID) switches::kEnableWebAudio, #else diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc index 80dc271..66c7bed 100644 --- a/content/public/common/content_switches.cc +++ b/content/public/common/content_switches.cc @@ -218,9 +218,6 @@ const char kSpeechRecognitionWebserviceKey[] = "speech-service-key"; // Disables animation on the compositor thread. const char kDisableThreadedAnimation[] = "disable-threaded-animation"; -// Disables video text tracks. -const char kDisableVideoTrack[] = "disable-video-track"; - #if defined(OS_ANDROID) // Enable web audio API. const char kEnableWebAudio[] = "enable-webaudio"; diff --git a/content/public/common/content_switches.h b/content/public/common/content_switches.h index 692d9d7..253a32d 100644 --- a/content/public/common/content_switches.h +++ b/content/public/common/content_switches.h @@ -81,7 +81,6 @@ CONTENT_EXPORT extern const char kEnableScriptedSpeech[]; extern const char kSpeechRecognitionWebserviceURL[]; extern const char kSpeechRecognitionWebserviceKey[]; CONTENT_EXPORT extern const char kDisableThreadedAnimation[]; -CONTENT_EXPORT extern const char kDisableVideoTrack[]; #if defined(OS_ANDROID) CONTENT_EXPORT extern const char kEnableWebAudio[]; #else diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc index 0a14ff2..da3a5d1 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc @@ -653,9 +653,6 @@ void RenderThreadImpl::EnsureWebKitInitialized() { WebKit::WebRuntimeFeatures::enablePointerLock( !command_line.HasSwitch(switches::kDisablePointerLock)); - WebKit::WebRuntimeFeatures::enableVideoTrack( - !command_line.HasSwitch(switches::kDisableVideoTrack)); - WebKit::WebRuntimeFeatures::enableEncryptedMedia( command_line.HasSwitch(switches::kEnableEncryptedMedia)); |