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

Side by Side Diff: chrome/common/chrome_content_client.cc

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; fix DLL export error in VS compile 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
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 619 matching lines...) Expand 10 before | Expand all | Expand 10 after
630 #endif 630 #endif
631 } 631 }
632 632
633 bool ChromeContentClient::IsSupplementarySiteIsolationModeEnabled() { 633 bool ChromeContentClient::IsSupplementarySiteIsolationModeEnabled() {
634 #if defined(ENABLE_EXTENSIONS) 634 #if defined(ENABLE_EXTENSIONS)
635 return extensions::IsIsolateExtensionsEnabled(); 635 return extensions::IsIsolateExtensionsEnabled();
636 #else 636 #else
637 return false; 637 return false;
638 #endif 638 #endif
639 } 639 }
640
641 base::StringPiece ChromeContentClient::GetOriginTrialPublicKey() {
642 return origin_trial_key_manager_.GetPublicKey();
643 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698