Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(75)

Side by Side Diff: android_webview/lib/main/aw_main_delegate.cc

Issue 182493003: enable subtitle support and the new fullscreen video (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: don't enable fullscreen subtitle for webview Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "android_webview/lib/main/aw_main_delegate.h" 5 #include "android_webview/lib/main/aw_main_delegate.h"
6 6
7 #include "android_webview/browser/aw_content_browser_client.h" 7 #include "android_webview/browser/aw_content_browser_client.h"
8 #include "android_webview/browser/gpu_memory_buffer_factory_impl.h" 8 #include "android_webview/browser/gpu_memory_buffer_factory_impl.h"
9 #include "android_webview/browser/hardware_renderer.h" 9 #include "android_webview/browser/hardware_renderer.h"
10 #include "android_webview/browser/scoped_allow_wait_for_legacy_web_view_api.h" 10 #include "android_webview/browser/scoped_allow_wait_for_legacy_web_view_api.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 cl->AppendSwitch(switches::kDisableSharedWorkers); 68 cl->AppendSwitch(switches::kDisableSharedWorkers);
69 69
70 // Ganesh backed 2D-Canvas integration is being implemented but not ready to 70 // Ganesh backed 2D-Canvas integration is being implemented but not ready to
71 // be turned on by default yet. 71 // be turned on by default yet.
72 if (!cl->HasSwitch(switches::kEnableAccelerated2dCanvas)) 72 if (!cl->HasSwitch(switches::kEnableAccelerated2dCanvas))
73 cl->AppendSwitch(switches::kDisableAccelerated2dCanvas); 73 cl->AppendSwitch(switches::kDisableAccelerated2dCanvas);
74 74
75 // File system API not supported (requires some new API; internal bug 6930981) 75 // File system API not supported (requires some new API; internal bug 6930981)
76 cl->AppendSwitch(switches::kDisableFileSystem); 76 cl->AppendSwitch(switches::kDisableFileSystem);
77 77
78 // Fullscreen video with subtitle is not yet supported.
79 cl->AppendSwitch(switches::kDisableOverlayFullscreenVideoSubtitle);
80
78 #if defined(VIDEO_HOLE) 81 #if defined(VIDEO_HOLE)
79 // Support EME/L1 with hole-punching. 82 // Support EME/L1 with hole-punching.
80 cl->AppendSwitch(switches::kMediaDrmEnableNonCompositing); 83 cl->AppendSwitch(switches::kMediaDrmEnableNonCompositing);
81 #endif 84 #endif
82 return false; 85 return false;
83 } 86 }
84 87
85 void AwMainDelegate::PreSandboxStartup() { 88 void AwMainDelegate::PreSandboxStartup() {
86 // TODO(torne): When we have a separate renderer process, we need to handle 89 // TODO(torne): When we have a separate renderer process, we need to handle
87 // being passed open FDs for the resource paks here. 90 // being passed open FDs for the resource paks here.
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 content::WebContentsViewDelegate* AwMainDelegate::CreateViewDelegate( 147 content::WebContentsViewDelegate* AwMainDelegate::CreateViewDelegate(
145 content::WebContents* web_contents) { 148 content::WebContents* web_contents) {
146 return AwWebContentsViewDelegate::Create(web_contents); 149 return AwWebContentsViewDelegate::Create(web_contents);
147 } 150 }
148 151
149 AwWebPreferencesPopulater* AwMainDelegate::CreateWebPreferencesPopulater() { 152 AwWebPreferencesPopulater* AwMainDelegate::CreateWebPreferencesPopulater() {
150 return new AwWebPreferencesPopulaterImpl(); 153 return new AwWebPreferencesPopulaterImpl();
151 } 154 }
152 155
153 } // namespace android_webview 156 } // namespace android_webview
OLDNEW
« no previous file with comments | « no previous file | content/browser/android/content_video_view.cc » ('j') | content/public/common/content_switches.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698