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

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 1110103004: Hook up Android closed captions 'enabled' setting to Blink (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed lgtm nits Created 5 years, 5 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "content/renderer/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 using blink::WebPluginParams; 212 using blink::WebPluginParams;
213 using blink::WebPopupMenuInfo; 213 using blink::WebPopupMenuInfo;
214 using blink::WebRange; 214 using blink::WebRange;
215 using blink::WebReferrerPolicy; 215 using blink::WebReferrerPolicy;
216 using blink::WebScriptSource; 216 using blink::WebScriptSource;
217 using blink::WebSearchableFormData; 217 using blink::WebSearchableFormData;
218 using blink::WebSecurityOrigin; 218 using blink::WebSecurityOrigin;
219 using blink::WebSecurityPolicy; 219 using blink::WebSecurityPolicy;
220 using blink::WebSerializedScriptValue; 220 using blink::WebSerializedScriptValue;
221 using blink::WebServiceWorkerProvider; 221 using blink::WebServiceWorkerProvider;
222 using blink::WebSettings;
222 using blink::WebStorageQuotaCallbacks; 223 using blink::WebStorageQuotaCallbacks;
223 using blink::WebString; 224 using blink::WebString;
224 using blink::WebURL; 225 using blink::WebURL;
225 using blink::WebURLError; 226 using blink::WebURLError;
226 using blink::WebURLRequest; 227 using blink::WebURLRequest;
227 using blink::WebURLResponse; 228 using blink::WebURLResponse;
228 using blink::WebUserGestureIndicator; 229 using blink::WebUserGestureIndicator;
229 using blink::WebVector; 230 using blink::WebVector;
230 using blink::WebView; 231 using blink::WebView;
231 using base::Time; 232 using base::Time;
(...skipping 1336 matching lines...) Expand 10 before | Expand all | Expand 10 after
1568 1569
1569 void RenderFrameImpl::OnDidUpdateSandboxFlags(blink::WebSandboxFlags flags) { 1570 void RenderFrameImpl::OnDidUpdateSandboxFlags(blink::WebSandboxFlags flags) {
1570 frame_->setFrameOwnerSandboxFlags(flags); 1571 frame_->setFrameOwnerSandboxFlags(flags);
1571 } 1572 }
1572 1573
1573 void RenderFrameImpl::OnTextTrackSettingsChanged( 1574 void RenderFrameImpl::OnTextTrackSettingsChanged(
1574 const FrameMsg_TextTrackSettings_Params& params) { 1575 const FrameMsg_TextTrackSettings_Params& params) {
1575 DCHECK(!frame_->parent()); 1576 DCHECK(!frame_->parent());
1576 if (!render_view_->webview()) 1577 if (!render_view_->webview())
1577 return; 1578 return;
1579
1580 if (params.text_tracks_enabled) {
1581 render_view_->webview()->settings()->setTextTrackKindUserPreference(
1582 WebSettings::TextTrackKindUserPreference::Captions);
1583 } else {
1584 render_view_->webview()->settings()->setTextTrackKindUserPreference(
1585 WebSettings::TextTrackKindUserPreference::Default);
1586 }
1578 render_view_->webview()->settings()->setTextTrackBackgroundColor( 1587 render_view_->webview()->settings()->setTextTrackBackgroundColor(
1579 WebString::fromUTF8(params.text_track_background_color)); 1588 WebString::fromUTF8(params.text_track_background_color));
1580 render_view_->webview()->settings()->setTextTrackFontFamily( 1589 render_view_->webview()->settings()->setTextTrackFontFamily(
1581 WebString::fromUTF8(params.text_track_font_family)); 1590 WebString::fromUTF8(params.text_track_font_family));
1582 render_view_->webview()->settings()->setTextTrackFontStyle( 1591 render_view_->webview()->settings()->setTextTrackFontStyle(
1583 WebString::fromUTF8(params.text_track_font_style)); 1592 WebString::fromUTF8(params.text_track_font_style));
1584 render_view_->webview()->settings()->setTextTrackFontVariant( 1593 render_view_->webview()->settings()->setTextTrackFontVariant(
1585 WebString::fromUTF8(params.text_track_font_variant)); 1594 WebString::fromUTF8(params.text_track_font_variant));
1586 render_view_->webview()->settings()->setTextTrackTextColor( 1595 render_view_->webview()->settings()->setTextTrackTextColor(
1587 WebString::fromUTF8(params.text_track_text_color)); 1596 WebString::fromUTF8(params.text_track_text_color));
(...skipping 3434 matching lines...) Expand 10 before | Expand all | Expand 10 after
5022 void RenderFrameImpl::RegisterMojoServices() { 5031 void RenderFrameImpl::RegisterMojoServices() {
5023 // Only main frame have ImageDownloader service. 5032 // Only main frame have ImageDownloader service.
5024 if (!frame_->parent()) { 5033 if (!frame_->parent()) {
5025 GetServiceRegistry()->AddService<image_downloader::ImageDownloader>( 5034 GetServiceRegistry()->AddService<image_downloader::ImageDownloader>(
5026 base::Bind(&ImageDownloaderImpl::CreateMojoService, 5035 base::Bind(&ImageDownloaderImpl::CreateMojoService,
5027 base::Unretained(this))); 5036 base::Unretained(this)));
5028 } 5037 }
5029 } 5038 }
5030 5039
5031 } // namespace content 5040 } // namespace content
OLDNEW
« no previous file with comments | « content/public/android/java/src/org/chromium/content/browser/accessibility/captioning/TextTrackSettings.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698