| 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 1641 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1652 | 1652 |
| 1653 if (logging::DialogsAreSuppressed()) | 1653 if (logging::DialogsAreSuppressed()) |
| 1654 command_line->AppendSwitch(switches::kNoErrorDialogs); | 1654 command_line->AppendSwitch(switches::kNoErrorDialogs); |
| 1655 | 1655 |
| 1656 std::string process_type = | 1656 std::string process_type = |
| 1657 command_line->GetSwitchValueASCII(switches::kProcessType); | 1657 command_line->GetSwitchValueASCII(switches::kProcessType); |
| 1658 const base::CommandLine& browser_command_line = | 1658 const base::CommandLine& browser_command_line = |
| 1659 *base::CommandLine::ForCurrentProcess(); | 1659 *base::CommandLine::ForCurrentProcess(); |
| 1660 | 1660 |
| 1661 static const char* const kCommonSwitchNames[] = { | 1661 static const char* const kCommonSwitchNames[] = { |
| 1662 #if BUILDFLAG(ENABLE_OOP_HEAP_PROFILING) |
| 1663 switches::kMemlogPipe, |
| 1664 #endif |
| 1662 switches::kUserAgent, | 1665 switches::kUserAgent, |
| 1663 switches::kUserDataDir, // Make logs go to the right file. | 1666 switches::kUserDataDir, // Make logs go to the right file. |
| 1664 }; | 1667 }; |
| 1665 command_line->CopySwitchesFrom(browser_command_line, kCommonSwitchNames, | 1668 command_line->CopySwitchesFrom(browser_command_line, kCommonSwitchNames, |
| 1666 arraysize(kCommonSwitchNames)); | 1669 arraysize(kCommonSwitchNames)); |
| 1667 | 1670 |
| 1668 static const char* const kDinosaurEasterEggSwitches[] = { | 1671 static const char* const kDinosaurEasterEggSwitches[] = { |
| 1669 error_page::switches::kDisableDinosaurEasterEgg, | 1672 error_page::switches::kDisableDinosaurEasterEgg, |
| 1670 }; | 1673 }; |
| 1671 command_line->CopySwitchesFrom(browser_command_line, | 1674 command_line->CopySwitchesFrom(browser_command_line, |
| (...skipping 1769 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3441 RedirectNonUINonIOBrowserThreadsToTaskScheduler() { | 3444 RedirectNonUINonIOBrowserThreadsToTaskScheduler() { |
| 3442 return variations::GetVariationParamValue( | 3445 return variations::GetVariationParamValue( |
| 3443 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true"; | 3446 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true"; |
| 3444 } | 3447 } |
| 3445 | 3448 |
| 3446 // static | 3449 // static |
| 3447 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting( | 3450 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting( |
| 3448 const storage::QuotaSettings* settings) { | 3451 const storage::QuotaSettings* settings) { |
| 3449 g_default_quota_settings = settings; | 3452 g_default_quota_settings = settings; |
| 3450 } | 3453 } |
| OLD | NEW |