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 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
90 #endif | 90 #endif |
91 | 91 |
92 #if defined(USE_AURA) | 92 #if defined(USE_AURA) |
93 #include "chrome/browser/chrome_browser_parts_aura.h" | 93 #include "chrome/browser/chrome_browser_parts_aura.h" |
94 #endif | 94 #endif |
95 | 95 |
96 #if defined(TOOLKIT_USES_GTK) | 96 #if defined(TOOLKIT_USES_GTK) |
97 #include "chrome/browser/chrome_browser_parts_gtk.h" | 97 #include "chrome/browser/chrome_browser_parts_gtk.h" |
98 #endif | 98 #endif |
99 | 99 |
| 100 #if defined(TOUCH_UI) |
| 101 #include "chrome/browser/chrome_browser_parts_touch.h" |
| 102 #endif |
| 103 |
100 #if defined(OS_LINUX) | 104 #if defined(OS_LINUX) |
101 #include "base/linux_util.h" | 105 #include "base/linux_util.h" |
102 #include "chrome/browser/crash_handler_host_linux.h" | 106 #include "chrome/browser/crash_handler_host_linux.h" |
103 #endif | 107 #endif |
104 | 108 |
105 #if defined(TOOLKIT_VIEWS) | 109 #if defined(TOOLKIT_VIEWS) |
106 #include "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h" | 110 #include "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h" |
107 #elif defined(TOOLKIT_USES_GTK) | 111 #elif defined(TOOLKIT_USES_GTK) |
108 #include "chrome/browser/tab_contents/tab_contents_view_gtk.h" | 112 #include "chrome/browser/tab_contents/tab_contents_view_gtk.h" |
109 #elif defined(OS_MACOSX) | 113 #elif defined(OS_MACOSX) |
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
223 parts_list->push_back(new ChromeBrowserMainParts(parameters)); | 227 parts_list->push_back(new ChromeBrowserMainParts(parameters)); |
224 #endif | 228 #endif |
225 | 229 |
226 // Construct additional browser parts. | 230 // Construct additional browser parts. |
227 #if defined(USE_AURA) | 231 #if defined(USE_AURA) |
228 parts_list->push_back(new ChromeBrowserPartsAura()); | 232 parts_list->push_back(new ChromeBrowserPartsAura()); |
229 #endif | 233 #endif |
230 #if defined(TOOLKIT_USES_GTK) | 234 #if defined(TOOLKIT_USES_GTK) |
231 parts_list->push_back(new ChromeBrowserPartsGtk()); | 235 parts_list->push_back(new ChromeBrowserPartsGtk()); |
232 #endif | 236 #endif |
| 237 #if defined(TOUCH_UI) |
| 238 parts_list->push_back(new ChromeBrowserPartsTouch()); |
| 239 #endif |
233 } | 240 } |
234 | 241 |
235 RenderWidgetHostView* ChromeContentBrowserClient::CreateViewForWidget( | 242 RenderWidgetHostView* ChromeContentBrowserClient::CreateViewForWidget( |
236 RenderWidgetHost* widget) { | 243 RenderWidgetHost* widget) { |
237 #if defined(USE_AURA) | 244 #if defined(USE_AURA) |
238 return new RenderWidgetHostViewAura(widget); | 245 return new RenderWidgetHostViewAura(widget); |
239 #elif defined(TOUCH_UI) | 246 #elif defined(TOUCH_UI) |
240 return new RenderWidgetHostViewViews(widget); | 247 return new RenderWidgetHostViewViews(widget); |
241 #elif defined(OS_WIN) | 248 #elif defined(OS_WIN) |
242 if (views::Widget::IsPureViews()) | 249 if (views::Widget::IsPureViews()) |
(...skipping 749 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
992 #if defined(USE_NSS) | 999 #if defined(USE_NSS) |
993 crypto::CryptoModuleBlockingPasswordDelegate* | 1000 crypto::CryptoModuleBlockingPasswordDelegate* |
994 ChromeContentBrowserClient::GetCryptoPasswordDelegate( | 1001 ChromeContentBrowserClient::GetCryptoPasswordDelegate( |
995 const GURL& url) { | 1002 const GURL& url) { |
996 return browser::NewCryptoModuleBlockingDialogDelegate( | 1003 return browser::NewCryptoModuleBlockingDialogDelegate( |
997 browser::kCryptoModulePasswordKeygen, url.host()); | 1004 browser::kCryptoModulePasswordKeygen, url.host()); |
998 } | 1005 } |
999 #endif | 1006 #endif |
1000 | 1007 |
1001 } // namespace chrome | 1008 } // namespace chrome |
OLD | NEW |