| 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 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 197 #include "chrome/browser/chromeos/system/input_device_settings.h" | 197 #include "chrome/browser/chromeos/system/input_device_settings.h" |
| 198 #include "chromeos/chromeos_switches.h" | 198 #include "chromeos/chromeos_switches.h" |
| 199 #include "components/user_manager/user_manager.h" | 199 #include "components/user_manager/user_manager.h" |
| 200 #elif defined(OS_LINUX) | 200 #elif defined(OS_LINUX) |
| 201 #include "chrome/browser/chrome_browser_main_linux.h" | 201 #include "chrome/browser/chrome_browser_main_linux.h" |
| 202 #elif defined(OS_ANDROID) | 202 #elif defined(OS_ANDROID) |
| 203 #include "chrome/browser/chrome_browser_main_android.h" | 203 #include "chrome/browser/chrome_browser_main_android.h" |
| 204 #include "chrome/common/descriptors_android.h" | 204 #include "chrome/common/descriptors_android.h" |
| 205 #include "components/crash/content/browser/crash_dump_manager_android.h" | 205 #include "components/crash/content/browser/crash_dump_manager_android.h" |
| 206 #include "components/navigation_interception/intercept_navigation_delegate.h" | 206 #include "components/navigation_interception/intercept_navigation_delegate.h" |
| 207 #include "components/offline_pages/offline_page_switches.h" | |
| 208 #include "ui/base/resource/resource_bundle_android.h" | 207 #include "ui/base/resource/resource_bundle_android.h" |
| 209 #elif defined(OS_POSIX) | 208 #elif defined(OS_POSIX) |
| 210 #include "chrome/browser/chrome_browser_main_posix.h" | 209 #include "chrome/browser/chrome_browser_main_posix.h" |
| 211 #endif | 210 #endif |
| 212 | 211 |
| 213 #if defined(OS_POSIX) && !defined(OS_MACOSX) | 212 #if defined(OS_POSIX) && !defined(OS_MACOSX) |
| 214 #include "base/debug/leak_annotations.h" | 213 #include "base/debug/leak_annotations.h" |
| 215 #include "components/crash/content/app/breakpad_linux.h" | 214 #include "components/crash/content/app/breakpad_linux.h" |
| 216 #include "components/crash/content/browser/crash_handler_host_linux.h" | 215 #include "components/crash/content/browser/crash_handler_host_linux.h" |
| 217 #endif | 216 #endif |
| (...skipping 1412 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1630 switches::kEnableAndroidSpellChecker, | 1629 switches::kEnableAndroidSpellChecker, |
| 1631 #endif | 1630 #endif |
| 1632 switches::kEnableBenchmarking, | 1631 switches::kEnableBenchmarking, |
| 1633 switches::kEnableNaCl, | 1632 switches::kEnableNaCl, |
| 1634 #if !defined(DISABLE_NACL) | 1633 #if !defined(DISABLE_NACL) |
| 1635 switches::kEnableNaClDebug, | 1634 switches::kEnableNaClDebug, |
| 1636 switches::kEnableNaClNonSfiMode, | 1635 switches::kEnableNaClNonSfiMode, |
| 1637 #endif | 1636 #endif |
| 1638 switches::kEnableNetBenchmarking, | 1637 switches::kEnableNetBenchmarking, |
| 1639 switches::kEnableNewBookmarkApps, | 1638 switches::kEnableNewBookmarkApps, |
| 1640 #if defined(OS_ANDROID) | |
| 1641 switches::kEnableOfflinePagesAsBookmarks, | |
| 1642 #endif | |
| 1643 switches::kEnableWasm, | 1639 switches::kEnableWasm, |
| 1644 #if !defined(DISABLE_NACL) | 1640 #if !defined(DISABLE_NACL) |
| 1645 switches::kForcePNaClSubzero, | 1641 switches::kForcePNaClSubzero, |
| 1646 #endif | 1642 #endif |
| 1647 switches::kJavaScriptHarmony, | 1643 switches::kJavaScriptHarmony, |
| 1648 switches::kMessageLoopHistogrammer, | 1644 switches::kMessageLoopHistogrammer, |
| 1649 switches::kPpapiFlashArgs, | 1645 switches::kPpapiFlashArgs, |
| 1650 switches::kPpapiFlashPath, | 1646 switches::kPpapiFlashPath, |
| 1651 switches::kPpapiFlashVersion, | 1647 switches::kPpapiFlashVersion, |
| 1652 switches::kProfilingAtStart, | 1648 switches::kProfilingAtStart, |
| (...skipping 1309 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2962 if (channel <= kMaxDisableEncryptionChannel) { | 2958 if (channel <= kMaxDisableEncryptionChannel) { |
| 2963 static const char* const kWebRtcDevSwitchNames[] = { | 2959 static const char* const kWebRtcDevSwitchNames[] = { |
| 2964 switches::kDisableWebRtcEncryption, | 2960 switches::kDisableWebRtcEncryption, |
| 2965 }; | 2961 }; |
| 2966 to_command_line->CopySwitchesFrom(from_command_line, | 2962 to_command_line->CopySwitchesFrom(from_command_line, |
| 2967 kWebRtcDevSwitchNames, | 2963 kWebRtcDevSwitchNames, |
| 2968 arraysize(kWebRtcDevSwitchNames)); | 2964 arraysize(kWebRtcDevSwitchNames)); |
| 2969 } | 2965 } |
| 2970 } | 2966 } |
| 2971 #endif // defined(ENABLE_WEBRTC) | 2967 #endif // defined(ENABLE_WEBRTC) |
| OLD | NEW |