Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 <map> | 9 #include <map> |
| 10 #include <memory> | 10 #include <memory> |
| (...skipping 702 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 713 | 713 |
| 714 bool ChromeContentClient::IsSupplementarySiteIsolationModeEnabled() { | 714 bool ChromeContentClient::IsSupplementarySiteIsolationModeEnabled() { |
| 715 #if defined(ENABLE_EXTENSIONS) | 715 #if defined(ENABLE_EXTENSIONS) |
| 716 return extensions::IsIsolateExtensionsEnabled(); | 716 return extensions::IsIsolateExtensionsEnabled(); |
| 717 #else | 717 #else |
| 718 return false; | 718 return false; |
| 719 #endif | 719 #endif |
| 720 } | 720 } |
| 721 | 721 |
| 722 content::OriginTrialPolicy* ChromeContentClient::GetOriginTrialPolicy() { | 722 content::OriginTrialPolicy* ChromeContentClient::GetOriginTrialPolicy() { |
| 723 if (!origin_trial_policy_) { | 723 if (!origin_trial_policy_) { |
|
sky
2016/09/14 17:46:42
optional: while here remove {}
Adam Rice
2016/09/15 02:05:55
Done.
| |
| 724 origin_trial_policy_ = base::WrapUnique(new ChromeOriginTrialPolicy()); | 724 origin_trial_policy_ = base::MakeUnique<ChromeOriginTrialPolicy>(); |
| 725 } | 725 } |
| 726 return origin_trial_policy_.get(); | 726 return origin_trial_policy_.get(); |
| 727 } | 727 } |
| 728 | 728 |
| 729 #if defined(OS_ANDROID) | 729 #if defined(OS_ANDROID) |
| 730 media::MediaClientAndroid* ChromeContentClient::GetMediaClientAndroid() { | 730 media::MediaClientAndroid* ChromeContentClient::GetMediaClientAndroid() { |
| 731 return new ChromeMediaClientAndroid(); | 731 return new ChromeMediaClientAndroid(); |
| 732 } | 732 } |
| 733 #endif // OS_ANDROID | 733 #endif // OS_ANDROID |
| OLD | NEW |