| 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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 #include "chrome/browser/ssl/ssl_add_certificate.h" | 71 #include "chrome/browser/ssl/ssl_add_certificate.h" |
| 72 #include "chrome/browser/ssl/ssl_blocking_page.h" | 72 #include "chrome/browser/ssl/ssl_blocking_page.h" |
| 73 #include "chrome/browser/ssl/ssl_cert_reporter.h" | 73 #include "chrome/browser/ssl/ssl_cert_reporter.h" |
| 74 #include "chrome/browser/ssl/ssl_client_certificate_selector.h" | 74 #include "chrome/browser/ssl/ssl_client_certificate_selector.h" |
| 75 #include "chrome/browser/ssl/ssl_error_handler.h" | 75 #include "chrome/browser/ssl/ssl_error_handler.h" |
| 76 #include "chrome/browser/sync_file_system/local/sync_file_system_backend.h" | 76 #include "chrome/browser/sync_file_system/local/sync_file_system_backend.h" |
| 77 #include "chrome/browser/tab_contents/tab_util.h" | 77 #include "chrome/browser/tab_contents/tab_util.h" |
| 78 #include "chrome/browser/tracing/chrome_tracing_delegate.h" | 78 #include "chrome/browser/tracing/chrome_tracing_delegate.h" |
| 79 #include "chrome/browser/ui/blocked_content/blocked_window_params.h" | 79 #include "chrome/browser/ui/blocked_content/blocked_window_params.h" |
| 80 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h" | 80 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h" |
| 81 #include "chrome/browser/ui/browser_navigator.h" |
| 82 #include "chrome/browser/ui/browser_navigator_params.h" |
| 81 #include "chrome/browser/ui/chrome_select_file_policy.h" | 83 #include "chrome/browser/ui/chrome_select_file_policy.h" |
| 82 #include "chrome/browser/ui/sync/sync_promo_ui.h" | 84 #include "chrome/browser/ui/sync/sync_promo_ui.h" |
| 83 #include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h" | 85 #include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h" |
| 84 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" | 86 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" |
| 85 #include "chrome/browser/ui/webui/log_web_ui_url.h" | 87 #include "chrome/browser/ui/webui/log_web_ui_url.h" |
| 86 #include "chrome/common/channel_info.h" | 88 #include "chrome/common/channel_info.h" |
| 87 #include "chrome/common/chrome_constants.h" | 89 #include "chrome/common/chrome_constants.h" |
| 88 #include "chrome/common/chrome_paths.h" | 90 #include "chrome/common/chrome_paths.h" |
| 89 #include "chrome/common/chrome_switches.h" | 91 #include "chrome/common/chrome_switches.h" |
| 90 #include "chrome/common/env_vars.h" | 92 #include "chrome/common/env_vars.h" |
| (...skipping 2616 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2707 if (channel <= kMaxDisableEncryptionChannel) { | 2709 if (channel <= kMaxDisableEncryptionChannel) { |
| 2708 static const char* const kWebRtcDevSwitchNames[] = { | 2710 static const char* const kWebRtcDevSwitchNames[] = { |
| 2709 switches::kDisableWebRtcEncryption, | 2711 switches::kDisableWebRtcEncryption, |
| 2710 }; | 2712 }; |
| 2711 to_command_line->CopySwitchesFrom(from_command_line, | 2713 to_command_line->CopySwitchesFrom(from_command_line, |
| 2712 kWebRtcDevSwitchNames, | 2714 kWebRtcDevSwitchNames, |
| 2713 arraysize(kWebRtcDevSwitchNames)); | 2715 arraysize(kWebRtcDevSwitchNames)); |
| 2714 } | 2716 } |
| 2715 } | 2717 } |
| 2716 #endif // defined(ENABLE_WEBRTC) | 2718 #endif // defined(ENABLE_WEBRTC) |
| OLD | NEW |