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

Side by Side Diff: chrome/common/chrome_content_client.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: Rebase 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 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 #include "chrome/common/chrome_content_client.h" 5 #include "chrome/common/chrome_content_client.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/crash_logging.h" 10 #include "base/debug/crash_logging.h"
(...skipping 625 matching lines...) Expand 10 before | Expand all | Expand 10 after
636 } 636 }
637 637
638 bool ChromeContentClient::IsSupplementarySiteIsolationModeEnabled() { 638 bool ChromeContentClient::IsSupplementarySiteIsolationModeEnabled() {
639 #if defined(ENABLE_EXTENSIONS) 639 #if defined(ENABLE_EXTENSIONS)
640 return extensions::IsIsolateExtensionsEnabled(); 640 return extensions::IsIsolateExtensionsEnabled();
641 #else 641 #else
642 return false; 642 return false;
643 #endif 643 #endif
644 } 644 }
645 645
646 void ChromeContentClient::InitializeOriginTrials() {
647 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
648 if (command_line->HasSwitch(switches::kOriginTrialPublicKey)) {
649 GetOriginTrialKeyManager()->SetPublicKeyFromASCIIString(
650 command_line->GetSwitchValueASCII(switches::kOriginTrialPublicKey));
651 }
652 }
653
646 base::StringPiece ChromeContentClient::GetOriginTrialPublicKey() { 654 base::StringPiece ChromeContentClient::GetOriginTrialPublicKey() {
647 return origin_trial_key_manager_.GetPublicKey(); 655 return origin_trial_key_manager_.GetPublicKey();
648 } 656 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698