| 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 89 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   100 #include "chrome/common/chrome_constants.h" |   100 #include "chrome/common/chrome_constants.h" | 
|   101 #include "chrome/common/chrome_paths.h" |   101 #include "chrome/common/chrome_paths.h" | 
|   102 #include "chrome/common/chrome_switches.h" |   102 #include "chrome/common/chrome_switches.h" | 
|   103 #include "chrome/common/env_vars.h" |   103 #include "chrome/common/env_vars.h" | 
|   104 #include "chrome/common/features.h" |   104 #include "chrome/common/features.h" | 
|   105 #include "chrome/common/logging_chrome.h" |   105 #include "chrome/common/logging_chrome.h" | 
|   106 #include "chrome/common/pepper_permission_util.h" |   106 #include "chrome/common/pepper_permission_util.h" | 
|   107 #include "chrome/common/pref_names.h" |   107 #include "chrome/common/pref_names.h" | 
|   108 #include "chrome/common/render_messages.h" |   108 #include "chrome/common/render_messages.h" | 
|   109 #include "chrome/common/secure_origin_whitelist.h" |   109 #include "chrome/common/secure_origin_whitelist.h" | 
 |   110 #include "chrome/common/stack_sampling_configuration.h" | 
|   110 #include "chrome/common/url_constants.h" |   111 #include "chrome/common/url_constants.h" | 
|   111 #include "chrome/grit/browser_resources.h" |   112 #include "chrome/grit/browser_resources.h" | 
|   112 #include "chrome/grit/generated_resources.h" |   113 #include "chrome/grit/generated_resources.h" | 
|   113 #include "chrome/installer/util/google_update_settings.h" |   114 #include "chrome/installer/util/google_update_settings.h" | 
|   114 #include "chromeos/chromeos_constants.h" |   115 #include "chromeos/chromeos_constants.h" | 
|   115 #include "components/autofill/content/browser/content_autofill_driver_factory.h" |   116 #include "components/autofill/content/browser/content_autofill_driver_factory.h" | 
|   116 #include "components/autofill/core/common/autofill_switches.h" |   117 #include "components/autofill/core/common/autofill_switches.h" | 
|   117 #include "components/cdm/browser/cdm_message_filter_android.h" |   118 #include "components/cdm/browser/cdm_message_filter_android.h" | 
|   118 #include "components/cloud_devices/common/cloud_devices_switches.h" |   119 #include "components/cloud_devices/common/cloud_devices_switches.h" | 
|   119 #include "components/content_settings/core/browser/content_settings_utils.h" |   120 #include "components/content_settings/core/browser/content_settings_utils.h" | 
| (...skipping 1606 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  1726     if (browser_command_line.HasSwitch(switches::kIgnoreGpuBlacklist) && |  1727     if (browser_command_line.HasSwitch(switches::kIgnoreGpuBlacklist) && | 
|  1727         !command_line->HasSwitch(switches::kDisableBreakpad)) |  1728         !command_line->HasSwitch(switches::kDisableBreakpad)) | 
|  1728       command_line->AppendSwitch(switches::kDisableBreakpad); |  1729       command_line->AppendSwitch(switches::kDisableBreakpad); | 
|  1729   } |  1730   } | 
|  1730  |  1731  | 
|  1731   // The command line switch kEnableBenchmarking needs to be specified along |  1732   // The command line switch kEnableBenchmarking needs to be specified along | 
|  1732   // with the kEnableStatsTable switch to ensure that the stats table global |  1733   // with the kEnableStatsTable switch to ensure that the stats table global | 
|  1733   // is initialized correctly. |  1734   // is initialized correctly. | 
|  1734   if (command_line->HasSwitch(switches::kEnableBenchmarking)) |  1735   if (command_line->HasSwitch(switches::kEnableBenchmarking)) | 
|  1735     DCHECK(command_line->HasSwitch(switches::kEnableStatsTable)); |  1736     DCHECK(command_line->HasSwitch(switches::kEnableStatsTable)); | 
 |  1737  | 
 |  1738   StackSamplingConfiguration::Get()->AppendCommandLineSwitchForChildProcess( | 
 |  1739       process_type, | 
 |  1740       command_line); | 
|  1736 } |  1741 } | 
|  1737  |  1742  | 
|  1738 std::string ChromeContentBrowserClient::GetApplicationLocale() { |  1743 std::string ChromeContentBrowserClient::GetApplicationLocale() { | 
|  1739   if (BrowserThread::CurrentlyOn(BrowserThread::IO)) |  1744   if (BrowserThread::CurrentlyOn(BrowserThread::IO)) | 
|  1740     return g_io_thread_application_locale.Get(); |  1745     return g_io_thread_application_locale.Get(); | 
|  1741   return g_browser_process->GetApplicationLocale(); |  1746   return g_browser_process->GetApplicationLocale(); | 
|  1742 } |  1747 } | 
|  1743  |  1748  | 
|  1744 std::string ChromeContentBrowserClient::GetAcceptLangs( |  1749 std::string ChromeContentBrowserClient::GetAcceptLangs( | 
|  1745     content::BrowserContext* context) { |  1750     content::BrowserContext* context) { | 
| (...skipping 1494 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  3240   if (channel <= kMaxDisableEncryptionChannel) { |  3245   if (channel <= kMaxDisableEncryptionChannel) { | 
|  3241     static const char* const kWebRtcDevSwitchNames[] = { |  3246     static const char* const kWebRtcDevSwitchNames[] = { | 
|  3242       switches::kDisableWebRtcEncryption, |  3247       switches::kDisableWebRtcEncryption, | 
|  3243     }; |  3248     }; | 
|  3244     to_command_line->CopySwitchesFrom(from_command_line, |  3249     to_command_line->CopySwitchesFrom(from_command_line, | 
|  3245                                       kWebRtcDevSwitchNames, |  3250                                       kWebRtcDevSwitchNames, | 
|  3246                                       arraysize(kWebRtcDevSwitchNames)); |  3251                                       arraysize(kWebRtcDevSwitchNames)); | 
|  3247   } |  3252   } | 
|  3248 } |  3253 } | 
|  3249 #endif  // defined(ENABLE_WEBRTC) |  3254 #endif  // defined(ENABLE_WEBRTC) | 
| OLD | NEW |