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

Unified 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/chrome_content_renderer_client.h
diff --git a/chrome/renderer/chrome_content_renderer_client.h b/chrome/renderer/chrome_content_renderer_client.h
index b0bb7fb96cc268523b60cb9b3e9b108b5f104b78..58a702f959bd2288cc3d1808d8cfb23e55376bf4 100644
--- a/chrome/renderer/chrome_content_renderer_client.h
+++ b/chrome/renderer/chrome_content_renderer_client.h
@@ -16,6 +16,7 @@
#include "base/gtest_prod_util.h"
#include "base/memory/scoped_ptr.h"
#include "base/strings/string16.h"
+#include "chrome/renderer/origin_trials/origin_trial_key_manager.h"
#include "content/public/renderer/content_renderer_client.h"
#include "ipc/ipc_channel_proxy.h"
#include "v8/include/v8.h"
@@ -156,6 +157,7 @@ class ChromeContentRendererClient : public content::ContentRendererClient {
v8::Local<v8::Context> context,
const GURL& url) override;
bool ShouldEnforceWebRTCRoutingPreferences() override;
+ base::StringPiece GetOriginTrialPublicKey() override;
#if defined(ENABLE_SPELLCHECK)
// Sets a new |spellcheck|. Used for testing only.
@@ -206,6 +208,8 @@ class ChromeContentRendererClient : public content::ContentRendererClient {
scoped_ptr<password_manager::CredentialManagerClient>
credential_manager_client_;
+ OriginTrialKeyManager origin_trial_key_manager_;
+
#if defined(ENABLE_SPELLCHECK)
scoped_ptr<SpellCheck> spellcheck_;
#endif
« 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