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 "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "chrome/app/breakpad_mac.h" | 8 #include "chrome/app/breakpad_mac.h" |
9 #include "chrome/browser/browser_about_handler.h" | 9 #include "chrome/browser/browser_about_handler.h" |
10 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
106 #elif defined(TOOLKIT_USES_GTK) | 106 #elif defined(TOOLKIT_USES_GTK) |
107 #include "chrome/browser/tab_contents/tab_contents_view_gtk.h" | 107 #include "chrome/browser/tab_contents/tab_contents_view_gtk.h" |
108 #elif defined(OS_MACOSX) | 108 #elif defined(OS_MACOSX) |
109 #include "chrome/browser/tab_contents/tab_contents_view_mac.h" | 109 #include "chrome/browser/tab_contents/tab_contents_view_mac.h" |
110 #endif | 110 #endif |
111 | 111 |
112 #if defined(USE_NSS) | 112 #if defined(USE_NSS) |
113 #include "chrome/browser/ui/crypto_module_password_dialog.h" | 113 #include "chrome/browser/ui/crypto_module_password_dialog.h" |
114 #endif | 114 #endif |
115 | 115 |
116 #if defined(USE_AURA) || defined(TOUCH_UI) | 116 #if defined(USE_AURA) |
| 117 #include "content/browser/renderer_host/render_widget_host_view_aura.h" |
| 118 #elif defined(TOUCH_UI) |
117 #include "chrome/browser/renderer_host/render_widget_host_view_views.h" | 119 #include "chrome/browser/renderer_host/render_widget_host_view_views.h" |
118 #elif defined(OS_WIN) | 120 #elif defined(OS_WIN) |
119 #include "chrome/browser/renderer_host/render_widget_host_view_views.h" | 121 #include "chrome/browser/renderer_host/render_widget_host_view_views.h" |
120 #include "content/browser/renderer_host/render_widget_host_view_win.h" | 122 #include "content/browser/renderer_host/render_widget_host_view_win.h" |
121 #elif defined(TOOLKIT_USES_GTK) | 123 #elif defined(TOOLKIT_USES_GTK) |
122 #include "content/browser/renderer_host/render_widget_host_view_gtk.h" | 124 #include "content/browser/renderer_host/render_widget_host_view_gtk.h" |
123 #elif defined(OS_MACOSX) | 125 #elif defined(OS_MACOSX) |
124 #include "content/browser/renderer_host/render_widget_host_view_mac.h" | 126 #include "content/browser/renderer_host/render_widget_host_view_mac.h" |
125 #endif | 127 #endif |
126 | 128 |
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
222 #if defined(USE_AURA) | 224 #if defined(USE_AURA) |
223 parts_list->push_back(new ChromeBrowserPartsAura()); | 225 parts_list->push_back(new ChromeBrowserPartsAura()); |
224 #endif | 226 #endif |
225 #if defined(TOOLKIT_USES_GTK) | 227 #if defined(TOOLKIT_USES_GTK) |
226 parts_list->push_back(new ChromeBrowserPartsGtk()); | 228 parts_list->push_back(new ChromeBrowserPartsGtk()); |
227 #endif | 229 #endif |
228 } | 230 } |
229 | 231 |
230 RenderWidgetHostView* ChromeContentBrowserClient::CreateViewForWidget( | 232 RenderWidgetHostView* ChromeContentBrowserClient::CreateViewForWidget( |
231 RenderWidgetHost* widget) { | 233 RenderWidgetHost* widget) { |
232 #if defined(USE_AURA) || defined(TOUCH_UI) | 234 #if defined(USE_AURA) |
| 235 return new RenderWidgetHostViewAura(widget); |
| 236 #elif defined(TOUCH_UI) |
233 return new RenderWidgetHostViewViews(widget); | 237 return new RenderWidgetHostViewViews(widget); |
234 #elif defined(OS_WIN) | 238 #elif defined(OS_WIN) |
235 if (views::Widget::IsPureViews()) | 239 if (views::Widget::IsPureViews()) |
236 return new RenderWidgetHostViewViews(widget); | 240 return new RenderWidgetHostViewViews(widget); |
237 return new RenderWidgetHostViewWin(widget); | 241 return new RenderWidgetHostViewWin(widget); |
238 #elif defined(TOOLKIT_USES_GTK) | 242 #elif defined(TOOLKIT_USES_GTK) |
239 return new RenderWidgetHostViewGtk(widget); | 243 return new RenderWidgetHostViewGtk(widget); |
240 #elif defined(OS_MACOSX) | 244 #elif defined(OS_MACOSX) |
241 return render_widget_host_view_mac::CreateRenderWidgetHostView(widget); | 245 return render_widget_host_view_mac::CreateRenderWidgetHostView(widget); |
242 #else | 246 #else |
(...skipping 749 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
992 #if defined(USE_NSS) | 996 #if defined(USE_NSS) |
993 crypto::CryptoModuleBlockingPasswordDelegate* | 997 crypto::CryptoModuleBlockingPasswordDelegate* |
994 ChromeContentBrowserClient::GetCryptoPasswordDelegate( | 998 ChromeContentBrowserClient::GetCryptoPasswordDelegate( |
995 const GURL& url) { | 999 const GURL& url) { |
996 return browser::NewCryptoModuleBlockingDialogDelegate( | 1000 return browser::NewCryptoModuleBlockingDialogDelegate( |
997 browser::kCryptoModulePasswordKeygen, url.host()); | 1001 browser::kCryptoModulePasswordKeygen, url.host()); |
998 } | 1002 } |
999 #endif | 1003 #endif |
1000 | 1004 |
1001 } // namespace chrome | 1005 } // namespace chrome |
OLD | NEW |