| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 97 #endif | 97 #endif |
| 98 | 98 |
| 99 #if defined(TOOLKIT_VIEWS) | 99 #if defined(TOOLKIT_VIEWS) |
| 100 #include "chrome/browser/chrome_browser_main_extra_parts_views.h" | 100 #include "chrome/browser/chrome_browser_main_extra_parts_views.h" |
| 101 #endif | 101 #endif |
| 102 | 102 |
| 103 #if defined(USE_AURA) | 103 #if defined(USE_AURA) |
| 104 #include "chrome/browser/chrome_browser_main_extra_parts_aura.h" | 104 #include "chrome/browser/chrome_browser_main_extra_parts_aura.h" |
| 105 #endif | 105 #endif |
| 106 | 106 |
| 107 #if defined(TOUCH_UI) | |
| 108 #include "chrome/browser/chrome_browser_main_extra_parts_touch.h" | |
| 109 #endif | |
| 110 | |
| 111 #if defined(OS_LINUX) || defined(OS_OPENBSD) | 107 #if defined(OS_LINUX) || defined(OS_OPENBSD) |
| 112 #include "base/linux_util.h" | 108 #include "base/linux_util.h" |
| 113 #include "chrome/browser/crash_handler_host_linux.h" | 109 #include "chrome/browser/crash_handler_host_linux.h" |
| 114 #endif | 110 #endif |
| 115 | 111 |
| 116 #if defined(TOOLKIT_VIEWS) | 112 #if defined(TOOLKIT_VIEWS) |
| 117 #include "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h" | 113 #include "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h" |
| 118 #elif defined(TOOLKIT_USES_GTK) | 114 #elif defined(TOOLKIT_USES_GTK) |
| 119 #include "chrome/browser/tab_contents/chrome_tab_contents_view_wrapper_gtk.h" | 115 #include "chrome/browser/tab_contents/chrome_tab_contents_view_wrapper_gtk.h" |
| 120 #include "chrome/browser/tab_contents/tab_contents_view_gtk.h" | 116 #include "chrome/browser/tab_contents/tab_contents_view_gtk.h" |
| (...skipping 992 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1113 #if defined(USE_NSS) | 1109 #if defined(USE_NSS) |
| 1114 crypto::CryptoModuleBlockingPasswordDelegate* | 1110 crypto::CryptoModuleBlockingPasswordDelegate* |
| 1115 ChromeContentBrowserClient::GetCryptoPasswordDelegate( | 1111 ChromeContentBrowserClient::GetCryptoPasswordDelegate( |
| 1116 const GURL& url) { | 1112 const GURL& url) { |
| 1117 return browser::NewCryptoModuleBlockingDialogDelegate( | 1113 return browser::NewCryptoModuleBlockingDialogDelegate( |
| 1118 browser::kCryptoModulePasswordKeygen, url.host()); | 1114 browser::kCryptoModulePasswordKeygen, url.host()); |
| 1119 } | 1115 } |
| 1120 #endif | 1116 #endif |
| 1121 | 1117 |
| 1122 } // namespace chrome | 1118 } // namespace chrome |
| OLD | NEW |