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

Side by Side Diff: chrome/renderer/chrome_content_renderer_client.h

Issue 665343002: Move KeySystemInfo to media. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase only Created 6 years, 2 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 (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 #ifndef CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ 5 #ifndef CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_
6 #define CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ 6 #define CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 bool IsExternalPepperPlugin(const std::string& module_name) override; 127 bool IsExternalPepperPlugin(const std::string& module_name) override;
128 blink::WebSpeechSynthesizer* OverrideSpeechSynthesizer( 128 blink::WebSpeechSynthesizer* OverrideSpeechSynthesizer(
129 blink::WebSpeechSynthesizerClient* client) override; 129 blink::WebSpeechSynthesizerClient* client) override;
130 bool ShouldReportDetailedMessageForSource( 130 bool ShouldReportDetailedMessageForSource(
131 const base::string16& source) const override; 131 const base::string16& source) const override;
132 bool ShouldEnableSiteIsolationPolicy() const override; 132 bool ShouldEnableSiteIsolationPolicy() const override;
133 blink::WebWorkerPermissionClientProxy* CreateWorkerPermissionClientProxy( 133 blink::WebWorkerPermissionClientProxy* CreateWorkerPermissionClientProxy(
134 content::RenderFrame* render_frame, 134 content::RenderFrame* render_frame,
135 blink::WebFrame* frame) override; 135 blink::WebFrame* frame) override;
136 bool AllowPepperMediaStreamAPI(const GURL& url) override; 136 bool AllowPepperMediaStreamAPI(const GURL& url) override;
137 void AddKeySystems(std::vector<content::KeySystemInfo>* key_systems) override; 137 void AddKeySystems(std::vector<media::KeySystemInfo>* key_systems) override;
138 bool IsPluginAllowedToUseDevChannelAPIs() override; 138 bool IsPluginAllowedToUseDevChannelAPIs() override;
139 bool IsPluginAllowedToUseCompositorAPI(const GURL& url) override; 139 bool IsPluginAllowedToUseCompositorAPI(const GURL& url) override;
140 bool IsPluginAllowedToUseVideoDecodeAPI(const GURL& url) override; 140 bool IsPluginAllowedToUseVideoDecodeAPI(const GURL& url) override;
141 content::BrowserPluginDelegate* CreateBrowserPluginDelegate( 141 content::BrowserPluginDelegate* CreateBrowserPluginDelegate(
142 content::RenderFrame* render_frame, 142 content::RenderFrame* render_frame,
143 const std::string& mime_type) override; 143 const std::string& mime_type) override;
144 144
145 #if defined(ENABLE_EXTENSIONS) 145 #if defined(ENABLE_EXTENSIONS)
146 // Takes ownership. 146 // Takes ownership.
147 void SetExtensionDispatcherForTest( 147 void SetExtensionDispatcherForTest(
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 #if defined(ENABLE_FULL_PRINTING) 228 #if defined(ENABLE_FULL_PRINTING)
229 scoped_ptr<ChromePDFPrintClient> pdf_print_client_; 229 scoped_ptr<ChromePDFPrintClient> pdf_print_client_;
230 #endif 230 #endif
231 #if defined(ENABLE_PLUGINS) 231 #if defined(ENABLE_PLUGINS)
232 std::set<std::string> allowed_compositor_origins_; 232 std::set<std::string> allowed_compositor_origins_;
233 std::set<std::string> allowed_video_decode_origins_; 233 std::set<std::string> allowed_video_decode_origins_;
234 #endif 234 #endif
235 }; 235 };
236 236
237 #endif // CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ 237 #endif // CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_
OLDNEW
« no previous file with comments | « android_webview/renderer/aw_key_systems.cc ('k') | chrome/renderer/chrome_content_renderer_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698