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

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 2389133008: Mash: Replaces "exe:chrome" with "service:content_browser" (Closed)
Patch Set: Created 4 years, 2 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/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 3041 matching lines...) Expand 10 before | Expand all | Expand 10 after
3052 3052
3053 std::unique_ptr<base::Value> 3053 std::unique_ptr<base::Value>
3054 ChromeContentBrowserClient::GetServiceManifestOverlay( 3054 ChromeContentBrowserClient::GetServiceManifestOverlay(
3055 const std::string& name) { 3055 const std::string& name) {
3056 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 3056 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
3057 int id = -1; 3057 int id = -1;
3058 if (name == content::kBrowserMojoApplicationName) 3058 if (name == content::kBrowserMojoApplicationName)
3059 id = IDR_CHROME_CONTENT_BROWSER_MANIFEST_OVERLAY; 3059 id = IDR_CHROME_CONTENT_BROWSER_MANIFEST_OVERLAY;
3060 else if (name == content::kGpuMojoApplicationName) 3060 else if (name == content::kGpuMojoApplicationName)
3061 id = IDR_CHROME_CONTENT_GPU_MANIFEST_OVERLAY; 3061 id = IDR_CHROME_CONTENT_GPU_MANIFEST_OVERLAY;
3062 else if (name == content::kRendererMojoApplicationName)
3063 id = IDR_CHROME_CONTENT_RENDERER_MANIFEST_OVERLAY;
3062 else if (name == content::kUtilityMojoApplicationName) 3064 else if (name == content::kUtilityMojoApplicationName)
3063 id = IDR_CHROME_CONTENT_UTILITY_MANIFEST_OVERLAY; 3065 id = IDR_CHROME_CONTENT_UTILITY_MANIFEST_OVERLAY;
3064 if (id == -1) 3066 if (id == -1)
3065 return nullptr; 3067 return nullptr;
3066 3068
3067 base::StringPiece manifest_contents = 3069 base::StringPiece manifest_contents =
3068 rb.GetRawDataResourceForScale(id, ui::ScaleFactor::SCALE_FACTOR_NONE); 3070 rb.GetRawDataResourceForScale(id, ui::ScaleFactor::SCALE_FACTOR_NONE);
3069 return base::JSONReader::Read(manifest_contents); 3071 return base::JSONReader::Read(manifest_contents);
3070 } 3072 }
3071 3073
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
3278 if (channel <= kMaxDisableEncryptionChannel) { 3280 if (channel <= kMaxDisableEncryptionChannel) {
3279 static const char* const kWebRtcDevSwitchNames[] = { 3281 static const char* const kWebRtcDevSwitchNames[] = {
3280 switches::kDisableWebRtcEncryption, 3282 switches::kDisableWebRtcEncryption,
3281 }; 3283 };
3282 to_command_line->CopySwitchesFrom(from_command_line, 3284 to_command_line->CopySwitchesFrom(from_command_line,
3283 kWebRtcDevSwitchNames, 3285 kWebRtcDevSwitchNames,
3284 arraysize(kWebRtcDevSwitchNames)); 3286 arraysize(kWebRtcDevSwitchNames));
3285 } 3287 }
3286 } 3288 }
3287 #endif // defined(ENABLE_WEBRTC) 3289 #endif // defined(ENABLE_WEBRTC)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698