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

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: Setting an enum value instead of passing down boolean to Blink 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 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 using blink::WebPluginParams; 213 using blink::WebPluginParams;
214 using blink::WebPopupMenuInfo; 214 using blink::WebPopupMenuInfo;
215 using blink::WebRange; 215 using blink::WebRange;
216 using blink::WebReferrerPolicy; 216 using blink::WebReferrerPolicy;
217 using blink::WebScriptSource; 217 using blink::WebScriptSource;
218 using blink::WebSearchableFormData; 218 using blink::WebSearchableFormData;
219 using blink::WebSecurityOrigin; 219 using blink::WebSecurityOrigin;
220 using blink::WebSecurityPolicy; 220 using blink::WebSecurityPolicy;
221 using blink::WebSerializedScriptValue; 221 using blink::WebSerializedScriptValue;
222 using blink::WebServiceWorkerProvider; 222 using blink::WebServiceWorkerProvider;
223 using blink::WebSettings;
223 using blink::WebStorageQuotaCallbacks; 224 using blink::WebStorageQuotaCallbacks;
224 using blink::WebString; 225 using blink::WebString;
225 using blink::WebURL; 226 using blink::WebURL;
226 using blink::WebURLError; 227 using blink::WebURLError;
227 using blink::WebURLRequest; 228 using blink::WebURLRequest;
228 using blink::WebURLResponse; 229 using blink::WebURLResponse;
229 using blink::WebUserGestureIndicator; 230 using blink::WebUserGestureIndicator;
230 using blink::WebVector; 231 using blink::WebVector;
231 using blink::WebView; 232 using blink::WebView;
232 using base::Time; 233 using base::Time;
(...skipping 1334 matching lines...) Expand 10 before | Expand all | Expand 10 after
1567 1568
1568 void RenderFrameImpl::OnDidUpdateSandboxFlags(blink::WebSandboxFlags flags) { 1569 void RenderFrameImpl::OnDidUpdateSandboxFlags(blink::WebSandboxFlags flags) {
1569 frame_->setFrameOwnerSandboxFlags(flags); 1570 frame_->setFrameOwnerSandboxFlags(flags);
1570 } 1571 }
1571 1572
1572 void RenderFrameImpl::OnTextTrackSettingsChanged( 1573 void RenderFrameImpl::OnTextTrackSettingsChanged(
1573 const FrameMsg_TextTrackSettings_Params& params) { 1574 const FrameMsg_TextTrackSettings_Params& params) {
1574 DCHECK(!frame_->parent()); 1575 DCHECK(!frame_->parent());
1575 if (!render_view_->webview()) 1576 if (!render_view_->webview())
1576 return; 1577 return;
1578
1579 if (params.text_tracks_enabled)
David Trainor- moved to gerrit 2015/07/09 21:46:47 I'm not sure, but does the styleguide require {} i
1580 render_view_->webview()->settings()->setTextTrackKindUserPreference(
1581 WebSettings::TextTrackKindUserPreference::Captions);
1582 else
1583 render_view_->webview()->settings()->setTextTrackKindUserPreference(
1584 WebSettings::TextTrackKindUserPreference::Default);
1577 render_view_->webview()->settings()->setTextTrackBackgroundColor( 1585 render_view_->webview()->settings()->setTextTrackBackgroundColor(
1578 WebString::fromUTF8(params.text_track_background_color)); 1586 WebString::fromUTF8(params.text_track_background_color));
1579 render_view_->webview()->settings()->setTextTrackFontFamily( 1587 render_view_->webview()->settings()->setTextTrackFontFamily(
1580 WebString::fromUTF8(params.text_track_font_family)); 1588 WebString::fromUTF8(params.text_track_font_family));
1581 render_view_->webview()->settings()->setTextTrackFontStyle( 1589 render_view_->webview()->settings()->setTextTrackFontStyle(
1582 WebString::fromUTF8(params.text_track_font_style)); 1590 WebString::fromUTF8(params.text_track_font_style));
1583 render_view_->webview()->settings()->setTextTrackFontVariant( 1591 render_view_->webview()->settings()->setTextTrackFontVariant(
1584 WebString::fromUTF8(params.text_track_font_variant)); 1592 WebString::fromUTF8(params.text_track_font_variant));
1585 render_view_->webview()->settings()->setTextTrackTextColor( 1593 render_view_->webview()->settings()->setTextTrackTextColor(
1586 WebString::fromUTF8(params.text_track_text_color)); 1594 WebString::fromUTF8(params.text_track_text_color));
(...skipping 3425 matching lines...) Expand 10 before | Expand all | Expand 10 after
5012 void RenderFrameImpl::RegisterMojoServices() { 5020 void RenderFrameImpl::RegisterMojoServices() {
5013 // Only main frame have ImageDownloader service. 5021 // Only main frame have ImageDownloader service.
5014 if (!frame_->parent()) { 5022 if (!frame_->parent()) {
5015 GetServiceRegistry()->AddService<image_downloader::ImageDownloader>( 5023 GetServiceRegistry()->AddService<image_downloader::ImageDownloader>(
5016 base::Bind(&ImageDownloaderImpl::CreateMojoService, 5024 base::Bind(&ImageDownloaderImpl::CreateMojoService,
5017 base::Unretained(this))); 5025 base::Unretained(this)));
5018 } 5026 }
5019 } 5027 }
5020 5028
5021 } // namespace content 5029 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698