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

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

Issue 1582403004: Linux: Send the product channel to non-browser processes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix content_browsertests linking Created 4 years, 11 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
« no previous file with comments | « no previous file | components/crash.gypi » ('j') | components/crash.gypi » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1381 matching lines...) Expand 10 before | Expand all | Expand 10 after
1392 int child_process_id) { 1392 int child_process_id) {
1393 #if defined(OS_MACOSX) 1393 #if defined(OS_MACOSX)
1394 scoped_ptr<metrics::ClientInfo> client_info = 1394 scoped_ptr<metrics::ClientInfo> client_info =
1395 GoogleUpdateSettings::LoadMetricsClientInfo(); 1395 GoogleUpdateSettings::LoadMetricsClientInfo();
1396 if (client_info) { 1396 if (client_info) {
1397 command_line->AppendSwitchASCII(switches::kMetricsClientID, 1397 command_line->AppendSwitchASCII(switches::kMetricsClientID,
1398 client_info->client_id); 1398 client_info->client_id);
1399 } 1399 }
1400 #elif defined(OS_POSIX) 1400 #elif defined(OS_POSIX)
1401 if (breakpad::IsCrashReporterEnabled()) { 1401 if (breakpad::IsCrashReporterEnabled()) {
1402 std::string switch_value;
1402 scoped_ptr<metrics::ClientInfo> client_info = 1403 scoped_ptr<metrics::ClientInfo> client_info =
1403 GoogleUpdateSettings::LoadMetricsClientInfo(); 1404 GoogleUpdateSettings::LoadMetricsClientInfo();
1405 if (client_info)
1406 switch_value = client_info->client_id;
1407 switch_value.push_back(',');
1408 switch_value.append(chrome::GetChannelString());
1404 command_line->AppendSwitchASCII(switches::kEnableCrashReporter, 1409 command_line->AppendSwitchASCII(switches::kEnableCrashReporter,
1405 client_info ? client_info->client_id 1410 switch_value);
1406 : std::string());
1407 } 1411 }
1408 #endif 1412 #endif
1409 1413
1410 if (logging::DialogsAreSuppressed()) 1414 if (logging::DialogsAreSuppressed())
1411 command_line->AppendSwitch(switches::kNoErrorDialogs); 1415 command_line->AppendSwitch(switches::kNoErrorDialogs);
1412 1416
1413 std::string process_type = 1417 std::string process_type =
1414 command_line->GetSwitchValueASCII(switches::kProcessType); 1418 command_line->GetSwitchValueASCII(switches::kProcessType);
1415 const base::CommandLine& browser_command_line = 1419 const base::CommandLine& browser_command_line =
1416 *base::CommandLine::ForCurrentProcess(); 1420 *base::CommandLine::ForCurrentProcess();
(...skipping 1407 matching lines...) Expand 10 before | Expand all | Expand 10 after
2824 if (channel <= kMaxDisableEncryptionChannel) { 2828 if (channel <= kMaxDisableEncryptionChannel) {
2825 static const char* const kWebRtcDevSwitchNames[] = { 2829 static const char* const kWebRtcDevSwitchNames[] = {
2826 switches::kDisableWebRtcEncryption, 2830 switches::kDisableWebRtcEncryption,
2827 }; 2831 };
2828 to_command_line->CopySwitchesFrom(from_command_line, 2832 to_command_line->CopySwitchesFrom(from_command_line,
2829 kWebRtcDevSwitchNames, 2833 kWebRtcDevSwitchNames,
2830 arraysize(kWebRtcDevSwitchNames)); 2834 arraysize(kWebRtcDevSwitchNames));
2831 } 2835 }
2832 } 2836 }
2833 #endif // defined(ENABLE_WEBRTC) 2837 #endif // defined(ENABLE_WEBRTC)
OLDNEW
« no previous file with comments | « no previous file | components/crash.gypi » ('j') | components/crash.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698