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

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

Issue 1223153003: Move JoinString to the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: windows Created 5 years, 5 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 1213 matching lines...) Expand 10 before | Expand all | Expand 10 after
1224 // The field trial is configured to force users that specify the 1224 // The field trial is configured to force users that specify the
1225 // blink-settings flag into a group with no params, and we return 1225 // blink-settings flag into a group with no params, and we return
1226 // above if no params were specified, so it's an error if we reach 1226 // above if no params were specified, so it's an error if we reach
1227 // this point. 1227 // this point.
1228 LOG(WARNING) << "Received field trial params, " 1228 LOG(WARNING) << "Received field trial params, "
1229 "but blink-settings switch already specified."; 1229 "but blink-settings switch already specified.";
1230 return; 1230 return;
1231 } 1231 }
1232 1232
1233 command_line->AppendSwitchASCII(switches::kBlinkSettings, 1233 command_line->AppendSwitchASCII(switches::kBlinkSettings,
1234 JoinString(blink_settings, ',')); 1234 base::JoinString(blink_settings, ","));
1235 } 1235 }
1236 1236
1237 } // namespace 1237 } // namespace
1238 1238
1239 void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( 1239 void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
1240 base::CommandLine* command_line, 1240 base::CommandLine* command_line,
1241 int child_process_id) { 1241 int child_process_id) {
1242 #if defined(OS_MACOSX) 1242 #if defined(OS_MACOSX)
1243 scoped_ptr<metrics::ClientInfo> client_info = 1243 scoped_ptr<metrics::ClientInfo> client_info =
1244 GoogleUpdateSettings::LoadMetricsClientInfo(); 1244 GoogleUpdateSettings::LoadMetricsClientInfo();
(...skipping 1302 matching lines...) Expand 10 before | Expand all | Expand 10 after
2547 switches::kDisableWebRtcEncryption, 2547 switches::kDisableWebRtcEncryption,
2548 }; 2548 };
2549 to_command_line->CopySwitchesFrom(from_command_line, 2549 to_command_line->CopySwitchesFrom(from_command_line,
2550 kWebRtcDevSwitchNames, 2550 kWebRtcDevSwitchNames,
2551 arraysize(kWebRtcDevSwitchNames)); 2551 arraysize(kWebRtcDevSwitchNames));
2552 } 2552 }
2553 } 2553 }
2554 #endif // defined(ENABLE_WEBRTC) 2554 #endif // defined(ENABLE_WEBRTC)
2555 2555
2556 } // namespace chrome 2556 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698