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

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

Issue 1653263005: [Experimental Framework] Move the trial token public key out of content and into the embedder. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase, and update for recent token changes Created 4 years, 10 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
« no previous file with comments | « chrome/chrome_renderer.gypi ('k') | chrome/renderer/chrome_content_renderer_client.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <stddef.h> 8 #include <stddef.h>
9 9
10 #include <map> 10 #include <map>
11 #include <set> 11 #include <set>
12 #include <string> 12 #include <string>
13 #include <vector> 13 #include <vector>
14 14
15 #include "base/compiler_specific.h" 15 #include "base/compiler_specific.h"
16 #include "base/gtest_prod_util.h" 16 #include "base/gtest_prod_util.h"
17 #include "base/memory/scoped_ptr.h" 17 #include "base/memory/scoped_ptr.h"
18 #include "base/strings/string16.h" 18 #include "base/strings/string16.h"
19 #include "chrome/renderer/origin_trials/origin_trial_key_manager.h"
19 #include "content/public/renderer/content_renderer_client.h" 20 #include "content/public/renderer/content_renderer_client.h"
20 #include "ipc/ipc_channel_proxy.h" 21 #include "ipc/ipc_channel_proxy.h"
21 #include "v8/include/v8.h" 22 #include "v8/include/v8.h"
22 23
23 class ChromeRenderProcessObserver; 24 class ChromeRenderProcessObserver;
24 #if defined(ENABLE_PRINT_PREVIEW) 25 #if defined(ENABLE_PRINT_PREVIEW)
25 class ChromePDFPrintClient; 26 class ChromePDFPrintClient;
26 #endif 27 #endif
27 class PrescientNetworkingDispatcher; 28 class PrescientNetworkingDispatcher;
28 #if defined(ENABLE_SPELLCHECK) 29 #if defined(ENABLE_SPELLCHECK)
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 void AddImageContextMenuProperties( 150 void AddImageContextMenuProperties(
150 const blink::WebURLResponse& response, 151 const blink::WebURLResponse& response,
151 std::map<std::string, std::string>* properties) override; 152 std::map<std::string, std::string>* properties) override;
152 void DidInitializeServiceWorkerContextOnWorkerThread( 153 void DidInitializeServiceWorkerContextOnWorkerThread(
153 v8::Local<v8::Context> context, 154 v8::Local<v8::Context> context,
154 const GURL& url) override; 155 const GURL& url) override;
155 void WillDestroyServiceWorkerContextOnWorkerThread( 156 void WillDestroyServiceWorkerContextOnWorkerThread(
156 v8::Local<v8::Context> context, 157 v8::Local<v8::Context> context,
157 const GURL& url) override; 158 const GURL& url) override;
158 bool ShouldEnforceWebRTCRoutingPreferences() override; 159 bool ShouldEnforceWebRTCRoutingPreferences() override;
160 base::StringPiece GetOriginTrialPublicKey() override;
159 161
160 #if defined(ENABLE_SPELLCHECK) 162 #if defined(ENABLE_SPELLCHECK)
161 // Sets a new |spellcheck|. Used for testing only. 163 // Sets a new |spellcheck|. Used for testing only.
162 // Takes ownership of |spellcheck|. 164 // Takes ownership of |spellcheck|.
163 void SetSpellcheck(SpellCheck* spellcheck); 165 void SetSpellcheck(SpellCheck* spellcheck);
164 #endif 166 #endif
165 167
166 #if defined(ENABLE_PLUGINS) 168 #if defined(ENABLE_PLUGINS)
167 static blink::WebPlugin* CreatePlugin( 169 static blink::WebPlugin* CreatePlugin(
168 content::RenderFrame* render_frame, 170 content::RenderFrame* render_frame,
(...skipping 30 matching lines...) Expand all
199 #endif 201 #endif
200 202
201 scoped_ptr<ChromeRenderProcessObserver> chrome_observer_; 203 scoped_ptr<ChromeRenderProcessObserver> chrome_observer_;
202 scoped_ptr<web_cache::WebCacheRenderProcessObserver> web_cache_observer_; 204 scoped_ptr<web_cache::WebCacheRenderProcessObserver> web_cache_observer_;
203 205
204 scoped_ptr<network_hints::PrescientNetworkingDispatcher> 206 scoped_ptr<network_hints::PrescientNetworkingDispatcher>
205 prescient_networking_dispatcher_; 207 prescient_networking_dispatcher_;
206 scoped_ptr<password_manager::CredentialManagerClient> 208 scoped_ptr<password_manager::CredentialManagerClient>
207 credential_manager_client_; 209 credential_manager_client_;
208 210
211 OriginTrialKeyManager origin_trial_key_manager_;
212
209 #if defined(ENABLE_SPELLCHECK) 213 #if defined(ENABLE_SPELLCHECK)
210 scoped_ptr<SpellCheck> spellcheck_; 214 scoped_ptr<SpellCheck> spellcheck_;
211 #endif 215 #endif
212 scoped_ptr<visitedlink::VisitedLinkSlave> visited_link_slave_; 216 scoped_ptr<visitedlink::VisitedLinkSlave> visited_link_slave_;
213 scoped_ptr<safe_browsing::PhishingClassifierFilter> phishing_classifier_; 217 scoped_ptr<safe_browsing::PhishingClassifierFilter> phishing_classifier_;
214 scoped_ptr<prerender::PrerenderDispatcher> prerender_dispatcher_; 218 scoped_ptr<prerender::PrerenderDispatcher> prerender_dispatcher_;
215 #if defined(ENABLE_WEBRTC) 219 #if defined(ENABLE_WEBRTC)
216 scoped_refptr<WebRtcLoggingMessageFilter> webrtc_logging_message_filter_; 220 scoped_refptr<WebRtcLoggingMessageFilter> webrtc_logging_message_filter_;
217 #endif 221 #endif
218 #if defined(ENABLE_PRINT_PREVIEW) 222 #if defined(ENABLE_PRINT_PREVIEW)
219 scoped_ptr<ChromePDFPrintClient> pdf_print_client_; 223 scoped_ptr<ChromePDFPrintClient> pdf_print_client_;
220 #endif 224 #endif
221 #if defined(ENABLE_PLUGINS) 225 #if defined(ENABLE_PLUGINS)
222 std::set<std::string> allowed_camera_device_origins_; 226 std::set<std::string> allowed_camera_device_origins_;
223 std::set<std::string> allowed_compositor_origins_; 227 std::set<std::string> allowed_compositor_origins_;
224 #endif 228 #endif
225 }; 229 };
226 230
227 #endif // CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ 231 #endif // CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_
OLDNEW
« no previous file with comments | « chrome/chrome_renderer.gypi ('k') | chrome/renderer/chrome_content_renderer_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698