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 231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
242 #endif | 242 #endif |
243 | 243 |
244 #if defined(TOOLKIT_VIEWS) | 244 #if defined(TOOLKIT_VIEWS) |
245 main_parts->AddParts(new ChromeBrowserMainExtraPartsViews()); | 245 main_parts->AddParts(new ChromeBrowserMainExtraPartsViews()); |
246 #endif | 246 #endif |
247 | 247 |
248 #if defined(USE_AURA) | 248 #if defined(USE_AURA) |
249 main_parts->AddParts(new ChromeBrowserMainExtraPartsAura()); | 249 main_parts->AddParts(new ChromeBrowserMainExtraPartsAura()); |
250 #endif | 250 #endif |
251 | 251 |
252 #if defined(TOUCH_UI) | |
253 main_parts->AddParts(new ChromeBrowserMainExtraPartsTouch()); | |
254 #endif | |
255 | |
256 return main_parts; | 252 return main_parts; |
257 } | 253 } |
258 | 254 |
259 RenderWidgetHostView* ChromeContentBrowserClient::CreateViewForWidget( | 255 RenderWidgetHostView* ChromeContentBrowserClient::CreateViewForWidget( |
260 RenderWidgetHost* widget) { | 256 RenderWidgetHost* widget) { |
261 #if defined(USE_AURA) | 257 #if defined(USE_AURA) |
262 return new RenderWidgetHostViewAura(widget); | 258 return new RenderWidgetHostViewAura(widget); |
263 #elif defined(OS_WIN) | 259 #elif defined(OS_WIN) |
264 return new RenderWidgetHostViewWin(widget); | 260 return new RenderWidgetHostViewWin(widget); |
265 #elif defined(TOOLKIT_USES_GTK) | 261 #elif defined(TOOLKIT_USES_GTK) |
(...skipping 858 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1124 #if defined(USE_NSS) | 1120 #if defined(USE_NSS) |
1125 crypto::CryptoModuleBlockingPasswordDelegate* | 1121 crypto::CryptoModuleBlockingPasswordDelegate* |
1126 ChromeContentBrowserClient::GetCryptoPasswordDelegate( | 1122 ChromeContentBrowserClient::GetCryptoPasswordDelegate( |
1127 const GURL& url) { | 1123 const GURL& url) { |
1128 return browser::NewCryptoModuleBlockingDialogDelegate( | 1124 return browser::NewCryptoModuleBlockingDialogDelegate( |
1129 browser::kCryptoModulePasswordKeygen, url.host()); | 1125 browser::kCryptoModulePasswordKeygen, url.host()); |
1130 } | 1126 } |
1131 #endif | 1127 #endif |
1132 | 1128 |
1133 } // namespace chrome | 1129 } // namespace chrome |
OLD | NEW |