| 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 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 205 #include "chrome/browser/chrome_browser_main_posix.h" | 205 #include "chrome/browser/chrome_browser_main_posix.h" |
| 206 #endif | 206 #endif |
| 207 | 207 |
| 208 #if defined(OS_POSIX) && !defined(OS_MACOSX) | 208 #if defined(OS_POSIX) && !defined(OS_MACOSX) |
| 209 #include "base/debug/leak_annotations.h" | 209 #include "base/debug/leak_annotations.h" |
| 210 #include "components/crash/content/app/breakpad_linux.h" | 210 #include "components/crash/content/app/breakpad_linux.h" |
| 211 #include "components/crash/content/browser/crash_handler_host_linux.h" | 211 #include "components/crash/content/browser/crash_handler_host_linux.h" |
| 212 #endif | 212 #endif |
| 213 | 213 |
| 214 #if BUILDFLAG(ANDROID_JAVA_UI) | 214 #if BUILDFLAG(ANDROID_JAVA_UI) |
| 215 #include "chrome/browser/android/new_tab_page_url_handler.h" | 215 #include "chrome/browser/android/ntp/new_tab_page_url_handler.h" |
| 216 #include "chrome/browser/android/webapps/single_tab_mode_tab_helper.h" | 216 #include "chrome/browser/android/webapps/single_tab_mode_tab_helper.h" |
| 217 #include "components/service_tab_launcher/browser/android/service_tab_launcher.h
" | 217 #include "components/service_tab_launcher/browser/android/service_tab_launcher.h
" |
| 218 #endif | 218 #endif |
| 219 | 219 |
| 220 #if defined(OS_ANDROID) | 220 #if defined(OS_ANDROID) |
| 221 #include "ui/base/ui_base_paths.h" | 221 #include "ui/base/ui_base_paths.h" |
| 222 #include "ui/gfx/android/device_display_info.h" | 222 #include "ui/gfx/android/device_display_info.h" |
| 223 #endif | 223 #endif |
| 224 | 224 |
| 225 #if defined(TOOLKIT_VIEWS) | 225 #if defined(TOOLKIT_VIEWS) |
| (...skipping 2753 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2979 if (channel <= kMaxDisableEncryptionChannel) { | 2979 if (channel <= kMaxDisableEncryptionChannel) { |
| 2980 static const char* const kWebRtcDevSwitchNames[] = { | 2980 static const char* const kWebRtcDevSwitchNames[] = { |
| 2981 switches::kDisableWebRtcEncryption, | 2981 switches::kDisableWebRtcEncryption, |
| 2982 }; | 2982 }; |
| 2983 to_command_line->CopySwitchesFrom(from_command_line, | 2983 to_command_line->CopySwitchesFrom(from_command_line, |
| 2984 kWebRtcDevSwitchNames, | 2984 kWebRtcDevSwitchNames, |
| 2985 arraysize(kWebRtcDevSwitchNames)); | 2985 arraysize(kWebRtcDevSwitchNames)); |
| 2986 } | 2986 } |
| 2987 } | 2987 } |
| 2988 #endif // defined(ENABLE_WEBRTC) | 2988 #endif // defined(ENABLE_WEBRTC) |
| OLD | NEW |