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

Unified Diff: chrome/app/chrome_main_delegate.cc

Issue 1737693002: Allow command-line arguments to override EF public key (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove new method from content API Created 4 years, 8 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 | « no previous file | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/chrome_main_delegate.cc
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
index a11e05d168c31ecd60af20d3c5d72e87474e03a3..ce6210a03e0fd94b079ece6db5a4996e1c2426f8 100644
--- a/chrome/app/chrome_main_delegate.cc
+++ b/chrome/app/chrome_main_delegate.cc
@@ -630,6 +630,12 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exit_code) {
}
#endif
+ if (command_line.HasSwitch(switches::kOriginTrialPublicKey)) {
+ chrome_content_client_.origin_trial_key_manager()
+ ->SetPublicKeyFromASCIIString(
+ command_line.GetSwitchValueASCII(switches::kOriginTrialPublicKey));
+ }
+
content::SetContentClient(&chrome_content_client_);
return false;
« no previous file with comments | « no previous file | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698