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 <set> | 7 #include <set> |
8 #include <utility> | 8 #include <utility> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
159 #elif defined(OS_LINUX) | 159 #elif defined(OS_LINUX) |
160 #include "chrome/browser/chrome_browser_main_linux.h" | 160 #include "chrome/browser/chrome_browser_main_linux.h" |
161 #elif defined(OS_ANDROID) | 161 #elif defined(OS_ANDROID) |
162 #include "chrome/browser/android/crash_dump_manager.h" | 162 #include "chrome/browser/android/crash_dump_manager.h" |
163 #include "chrome/browser/chrome_browser_main_android.h" | 163 #include "chrome/browser/chrome_browser_main_android.h" |
164 #include "chrome/common/descriptors_android.h" | 164 #include "chrome/common/descriptors_android.h" |
165 #elif defined(OS_POSIX) | 165 #elif defined(OS_POSIX) |
166 #include "chrome/browser/chrome_browser_main_posix.h" | 166 #include "chrome/browser/chrome_browser_main_posix.h" |
167 #endif | 167 #endif |
168 | 168 |
169 #if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_ANDROID) | 169 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_NACL) |
Paweł Hajdan Jr.
2013/08/26 22:01:40
nit: Are the OS_NACL guards needed?
| |
170 #include "base/linux_util.h" | 170 #include "base/linux_util.h" |
171 #include "chrome/browser/crash_handler_host_linux.h" | 171 #include "chrome/browser/crash_handler_host_linux.h" |
172 #endif | 172 #endif |
173 | 173 |
174 #if !defined(OS_ANDROID) | 174 #if !defined(OS_ANDROID) |
175 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h" | 175 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h" |
176 #endif | 176 #endif |
177 | 177 |
178 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION) | 178 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION) |
179 #include "chrome/browser/captive_portal/captive_portal_tab_helper.h" | 179 #include "chrome/browser/captive_portal/captive_portal_tab_helper.h" |
(...skipping 2373 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2553 #if defined(USE_NSS) | 2553 #if defined(USE_NSS) |
2554 crypto::CryptoModuleBlockingPasswordDelegate* | 2554 crypto::CryptoModuleBlockingPasswordDelegate* |
2555 ChromeContentBrowserClient::GetCryptoPasswordDelegate( | 2555 ChromeContentBrowserClient::GetCryptoPasswordDelegate( |
2556 const GURL& url) { | 2556 const GURL& url) { |
2557 return chrome::NewCryptoModuleBlockingDialogDelegate( | 2557 return chrome::NewCryptoModuleBlockingDialogDelegate( |
2558 chrome::kCryptoModulePasswordKeygen, url.host()); | 2558 chrome::kCryptoModulePasswordKeygen, url.host()); |
2559 } | 2559 } |
2560 #endif | 2560 #endif |
2561 | 2561 |
2562 } // namespace chrome | 2562 } // namespace chrome |
OLD | NEW |