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

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

Issue 191093002: Simplify the user agent code some more since after r255534 it's not affected by the site's URL. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: patchset 15 which works Created 6 years, 9 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 | Annotate | Revision Log
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 <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 1456 matching lines...) Expand 10 before | Expand all | Expand 10 after
1467 #endif // OS_POSIX 1467 #endif // OS_POSIX
1468 1468
1469 if (logging::DialogsAreSuppressed()) 1469 if (logging::DialogsAreSuppressed())
1470 command_line->AppendSwitch(switches::kNoErrorDialogs); 1470 command_line->AppendSwitch(switches::kNoErrorDialogs);
1471 1471
1472 std::string process_type = 1472 std::string process_type =
1473 command_line->GetSwitchValueASCII(switches::kProcessType); 1473 command_line->GetSwitchValueASCII(switches::kProcessType);
1474 const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess(); 1474 const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
1475 1475
1476 static const char* const kCommonSwitchNames[] = { 1476 static const char* const kCommonSwitchNames[] = {
1477 switches::kUserAgent,
1477 switches::kUserDataDir, // Make logs go to the right file. 1478 switches::kUserDataDir, // Make logs go to the right file.
1478 }; 1479 };
1479 command_line->CopySwitchesFrom(browser_command_line, kCommonSwitchNames, 1480 command_line->CopySwitchesFrom(browser_command_line, kCommonSwitchNames,
1480 arraysize(kCommonSwitchNames)); 1481 arraysize(kCommonSwitchNames));
1481 1482
1482 #if defined(ENABLE_IPC_FUZZER) 1483 #if defined(ENABLE_IPC_FUZZER)
1483 static const char* const kIpcFuzzerSwitches[] = { 1484 static const char* const kIpcFuzzerSwitches[] = {
1484 switches::kIpcFuzzerTestcase, 1485 switches::kIpcFuzzerTestcase,
1485 }; 1486 };
1486 command_line->CopySwitchesFrom(browser_command_line, kIpcFuzzerSwitches, 1487 command_line->CopySwitchesFrom(browser_command_line, kIpcFuzzerSwitches,
(...skipping 1244 matching lines...) Expand 10 before | Expand all | Expand 10 after
2731 switches::kDisableWebRtcEncryption, 2732 switches::kDisableWebRtcEncryption,
2732 }; 2733 };
2733 to_command_line->CopySwitchesFrom(from_command_line, 2734 to_command_line->CopySwitchesFrom(from_command_line,
2734 kWebRtcDevSwitchNames, 2735 kWebRtcDevSwitchNames,
2735 arraysize(kWebRtcDevSwitchNames)); 2736 arraysize(kWebRtcDevSwitchNames));
2736 } 2737 }
2737 } 2738 }
2738 #endif // defined(ENABLE_WEBRTC) 2739 #endif // defined(ENABLE_WEBRTC)
2739 2740
2740 } // namespace chrome 2741 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/autofill/risk/fingerprint_browsertest.cc ('k') | chrome/browser/chromeos/policy/auto_enrollment_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698