| 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/browser/chrome_content_browser_client.h" | 5 #include "chrome/browser/chrome_content_browser_client.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <set> | 8 #include <set> |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 3053 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3064 | 3064 |
| 3065 std::unique_ptr<base::Value> | 3065 std::unique_ptr<base::Value> |
| 3066 ChromeContentBrowserClient::GetServiceManifestOverlay( | 3066 ChromeContentBrowserClient::GetServiceManifestOverlay( |
| 3067 const std::string& name) { | 3067 const std::string& name) { |
| 3068 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); | 3068 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); |
| 3069 int id = -1; | 3069 int id = -1; |
| 3070 if (name == content::kBrowserServiceName) | 3070 if (name == content::kBrowserServiceName) |
| 3071 id = IDR_CHROME_CONTENT_BROWSER_MANIFEST_OVERLAY; | 3071 id = IDR_CHROME_CONTENT_BROWSER_MANIFEST_OVERLAY; |
| 3072 else if (name == content::kGpuServiceName) | 3072 else if (name == content::kGpuServiceName) |
| 3073 id = IDR_CHROME_CONTENT_GPU_MANIFEST_OVERLAY; | 3073 id = IDR_CHROME_CONTENT_GPU_MANIFEST_OVERLAY; |
| 3074 else if (name == content::kRendererServiceName) |
| 3075 id = IDR_CHROME_CONTENT_RENDERER_MANIFEST_OVERLAY; |
| 3074 else if (name == content::kUtilityServiceName) | 3076 else if (name == content::kUtilityServiceName) |
| 3075 id = IDR_CHROME_CONTENT_UTILITY_MANIFEST_OVERLAY; | 3077 id = IDR_CHROME_CONTENT_UTILITY_MANIFEST_OVERLAY; |
| 3076 if (id == -1) | 3078 if (id == -1) |
| 3077 return nullptr; | 3079 return nullptr; |
| 3078 | 3080 |
| 3079 base::StringPiece manifest_contents = | 3081 base::StringPiece manifest_contents = |
| 3080 rb.GetRawDataResourceForScale(id, ui::ScaleFactor::SCALE_FACTOR_NONE); | 3082 rb.GetRawDataResourceForScale(id, ui::ScaleFactor::SCALE_FACTOR_NONE); |
| 3081 return base::JSONReader::Read(manifest_contents); | 3083 return base::JSONReader::Read(manifest_contents); |
| 3082 } | 3084 } |
| 3083 | 3085 |
| (...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3290 if (channel <= kMaxDisableEncryptionChannel) { | 3292 if (channel <= kMaxDisableEncryptionChannel) { |
| 3291 static const char* const kWebRtcDevSwitchNames[] = { | 3293 static const char* const kWebRtcDevSwitchNames[] = { |
| 3292 switches::kDisableWebRtcEncryption, | 3294 switches::kDisableWebRtcEncryption, |
| 3293 }; | 3295 }; |
| 3294 to_command_line->CopySwitchesFrom(from_command_line, | 3296 to_command_line->CopySwitchesFrom(from_command_line, |
| 3295 kWebRtcDevSwitchNames, | 3297 kWebRtcDevSwitchNames, |
| 3296 arraysize(kWebRtcDevSwitchNames)); | 3298 arraysize(kWebRtcDevSwitchNames)); |
| 3297 } | 3299 } |
| 3298 } | 3300 } |
| 3299 #endif // defined(ENABLE_WEBRTC) | 3301 #endif // defined(ENABLE_WEBRTC) |
| OLD | NEW |