| 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 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 149 #elif defined(OS_LINUX) | 149 #elif defined(OS_LINUX) |
| 150 #include "chrome/browser/chrome_browser_main_linux.h" | 150 #include "chrome/browser/chrome_browser_main_linux.h" |
| 151 #elif defined(OS_ANDROID) | 151 #elif defined(OS_ANDROID) |
| 152 #include "chrome/browser/android/crash_dump_manager.h" | 152 #include "chrome/browser/android/crash_dump_manager.h" |
| 153 #include "chrome/browser/chrome_browser_main_android.h" | 153 #include "chrome/browser/chrome_browser_main_android.h" |
| 154 #include "chrome/common/descriptors_android.h" | 154 #include "chrome/common/descriptors_android.h" |
| 155 #elif defined(OS_POSIX) | 155 #elif defined(OS_POSIX) |
| 156 #include "chrome/browser/chrome_browser_main_posix.h" | 156 #include "chrome/browser/chrome_browser_main_posix.h" |
| 157 #endif | 157 #endif |
| 158 | 158 |
| 159 #if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_ANDROID) | 159 #if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_ANDROID) |
| 160 #include "base/linux_util.h" | 160 #include "base/linux_util.h" |
| 161 #include "chrome/browser/crash_handler_host_linux.h" | 161 #include "chrome/browser/crash_handler_host_linux.h" |
| 162 #endif | 162 #endif |
| 163 | 163 |
| 164 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION) | 164 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION) |
| 165 #include "chrome/browser/captive_portal/captive_portal_tab_helper.h" | 165 #include "chrome/browser/captive_portal/captive_portal_tab_helper.h" |
| 166 #endif | 166 #endif |
| 167 | 167 |
| 168 #if defined(OS_ANDROID) | 168 #if defined(OS_ANDROID) |
| 169 #include "ui/base/ui_base_paths.h" | 169 #include "ui/base/ui_base_paths.h" |
| (...skipping 2157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2327 #if defined(USE_NSS) | 2327 #if defined(USE_NSS) |
| 2328 crypto::CryptoModuleBlockingPasswordDelegate* | 2328 crypto::CryptoModuleBlockingPasswordDelegate* |
| 2329 ChromeContentBrowserClient::GetCryptoPasswordDelegate( | 2329 ChromeContentBrowserClient::GetCryptoPasswordDelegate( |
| 2330 const GURL& url) { | 2330 const GURL& url) { |
| 2331 return chrome::NewCryptoModuleBlockingDialogDelegate( | 2331 return chrome::NewCryptoModuleBlockingDialogDelegate( |
| 2332 chrome::kCryptoModulePasswordKeygen, url.host()); | 2332 chrome::kCryptoModulePasswordKeygen, url.host()); |
| 2333 } | 2333 } |
| 2334 #endif | 2334 #endif |
| 2335 | 2335 |
| 2336 } // namespace chrome | 2336 } // namespace chrome |
| OLD | NEW |