| 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 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 121 #elif defined(OS_MACOSX) | 121 #elif defined(OS_MACOSX) |
| 122 #include "chrome/browser/tab_contents/tab_contents_view_mac.h" | 122 #include "chrome/browser/tab_contents/tab_contents_view_mac.h" |
| 123 #endif | 123 #endif |
| 124 | 124 |
| 125 #if defined(USE_NSS) | 125 #if defined(USE_NSS) |
| 126 #include "chrome/browser/ui/crypto_module_password_dialog.h" | 126 #include "chrome/browser/ui/crypto_module_password_dialog.h" |
| 127 #endif | 127 #endif |
| 128 | 128 |
| 129 #if defined(USE_AURA) | 129 #if defined(USE_AURA) |
| 130 #include "content/browser/renderer_host/render_widget_host_view_aura.h" | 130 #include "content/browser/renderer_host/render_widget_host_view_aura.h" |
| 131 #elif defined(TOUCH_UI) | |
| 132 #include "chrome/browser/renderer_host/render_widget_host_view_views.h" | |
| 133 #elif defined(OS_WIN) | 131 #elif defined(OS_WIN) |
| 134 #include "chrome/browser/renderer_host/render_widget_host_view_views.h" | |
| 135 #include "content/browser/renderer_host/render_widget_host_view_win.h" | 132 #include "content/browser/renderer_host/render_widget_host_view_win.h" |
| 136 #elif defined(TOOLKIT_USES_GTK) | 133 #elif defined(TOOLKIT_USES_GTK) |
| 137 #include "content/browser/renderer_host/render_widget_host_view_gtk.h" | 134 #include "content/browser/renderer_host/render_widget_host_view_gtk.h" |
| 138 #elif defined(OS_MACOSX) | 135 #elif defined(OS_MACOSX) |
| 139 #include "content/browser/renderer_host/render_widget_host_view_mac.h" | 136 #include "content/browser/renderer_host/render_widget_host_view_mac.h" |
| 140 #endif | 137 #endif |
| 141 | 138 |
| 142 using content::BrowserThread; | 139 using content::BrowserThread; |
| 143 | 140 |
| 144 namespace { | 141 namespace { |
| (...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 255 #if defined(TOUCH_UI) | 252 #if defined(TOUCH_UI) |
| 256 parts_list->push_back(new ChromeBrowserPartsTouch()); | 253 parts_list->push_back(new ChromeBrowserPartsTouch()); |
| 257 #endif | 254 #endif |
| 258 | 255 |
| 259 } | 256 } |
| 260 | 257 |
| 261 RenderWidgetHostView* ChromeContentBrowserClient::CreateViewForWidget( | 258 RenderWidgetHostView* ChromeContentBrowserClient::CreateViewForWidget( |
| 262 RenderWidgetHost* widget) { | 259 RenderWidgetHost* widget) { |
| 263 #if defined(USE_AURA) | 260 #if defined(USE_AURA) |
| 264 return new RenderWidgetHostViewAura(widget); | 261 return new RenderWidgetHostViewAura(widget); |
| 265 #elif defined(TOUCH_UI) | |
| 266 return new RenderWidgetHostViewViews(widget); | |
| 267 #elif defined(OS_WIN) | 262 #elif defined(OS_WIN) |
| 268 if (views::Widget::IsPureViews()) | |
| 269 return new RenderWidgetHostViewViews(widget); | |
| 270 return new RenderWidgetHostViewWin(widget); | 263 return new RenderWidgetHostViewWin(widget); |
| 271 #elif defined(TOOLKIT_USES_GTK) | 264 #elif defined(TOOLKIT_USES_GTK) |
| 272 return new RenderWidgetHostViewGtk(widget); | 265 return new RenderWidgetHostViewGtk(widget); |
| 273 #elif defined(OS_MACOSX) | 266 #elif defined(OS_MACOSX) |
| 274 return render_widget_host_view_mac::CreateRenderWidgetHostView(widget); | 267 return render_widget_host_view_mac::CreateRenderWidgetHostView(widget); |
| 275 #else | 268 #else |
| 276 #error Need to create your platform ViewForWidget here. | 269 #error Need to create your platform ViewForWidget here. |
| 277 #endif | 270 #endif |
| 278 } | 271 } |
| 279 | 272 |
| (...skipping 854 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1134 #if defined(USE_NSS) | 1127 #if defined(USE_NSS) |
| 1135 crypto::CryptoModuleBlockingPasswordDelegate* | 1128 crypto::CryptoModuleBlockingPasswordDelegate* |
| 1136 ChromeContentBrowserClient::GetCryptoPasswordDelegate( | 1129 ChromeContentBrowserClient::GetCryptoPasswordDelegate( |
| 1137 const GURL& url) { | 1130 const GURL& url) { |
| 1138 return browser::NewCryptoModuleBlockingDialogDelegate( | 1131 return browser::NewCryptoModuleBlockingDialogDelegate( |
| 1139 browser::kCryptoModulePasswordKeygen, url.host()); | 1132 browser::kCryptoModulePasswordKeygen, url.host()); |
| 1140 } | 1133 } |
| 1141 #endif | 1134 #endif |
| 1142 | 1135 |
| 1143 } // namespace chrome | 1136 } // namespace chrome |
| OLD | NEW |