| 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 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 108 #include "chrome/browser/crash_handler_host_linux.h" | 108 #include "chrome/browser/crash_handler_host_linux.h" |
| 109 #endif | 109 #endif |
| 110 | 110 |
| 111 #if defined(TOUCH_UI) | 111 #if defined(TOUCH_UI) |
| 112 #include "chrome/browser/chrome_browser_parts_touch.h" | 112 #include "chrome/browser/chrome_browser_parts_touch.h" |
| 113 #endif | 113 #endif |
| 114 | 114 |
| 115 #if defined(TOOLKIT_VIEWS) | 115 #if defined(TOOLKIT_VIEWS) |
| 116 #include "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h" | 116 #include "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h" |
| 117 #elif defined(TOOLKIT_USES_GTK) | 117 #elif defined(TOOLKIT_USES_GTK) |
| 118 #include "chrome/browser/tab_contents/chrome_tab_contents_view_wrapper_gtk.h" |
| 118 #include "chrome/browser/tab_contents/tab_contents_view_gtk.h" | 119 #include "chrome/browser/tab_contents/tab_contents_view_gtk.h" |
| 119 #elif defined(OS_MACOSX) | 120 #elif defined(OS_MACOSX) |
| 120 #include "chrome/browser/tab_contents/tab_contents_view_mac.h" | 121 #include "chrome/browser/tab_contents/tab_contents_view_mac.h" |
| 121 #endif | 122 #endif |
| 122 | 123 |
| 123 #if defined(USE_NSS) | 124 #if defined(USE_NSS) |
| 124 #include "chrome/browser/ui/crypto_module_password_dialog.h" | 125 #include "chrome/browser/ui/crypto_module_password_dialog.h" |
| 125 #endif | 126 #endif |
| 126 | 127 |
| 127 #if defined(USE_AURA) | 128 #if defined(USE_AURA) |
| (...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 273 #else | 274 #else |
| 274 #error Need to create your platform ViewForWidget here. | 275 #error Need to create your platform ViewForWidget here. |
| 275 #endif | 276 #endif |
| 276 } | 277 } |
| 277 | 278 |
| 278 TabContentsView* ChromeContentBrowserClient::CreateTabContentsView( | 279 TabContentsView* ChromeContentBrowserClient::CreateTabContentsView( |
| 279 TabContents* tab_contents) { | 280 TabContents* tab_contents) { |
| 280 #if defined(TOOLKIT_VIEWS) | 281 #if defined(TOOLKIT_VIEWS) |
| 281 return new TabContentsViewViews(tab_contents); | 282 return new TabContentsViewViews(tab_contents); |
| 282 #elif defined(TOOLKIT_USES_GTK) | 283 #elif defined(TOOLKIT_USES_GTK) |
| 283 return new TabContentsViewGtk(tab_contents); | 284 return new TabContentsViewGtk(tab_contents, |
| 285 new ChromeTabContentsViewWrapperGtk); |
| 284 #elif defined(OS_MACOSX) | 286 #elif defined(OS_MACOSX) |
| 285 return tab_contents_view_mac::CreateTabContentsView(tab_contents); | 287 return tab_contents_view_mac::CreateTabContentsView(tab_contents); |
| 286 #else | 288 #else |
| 287 #error Need to create your platform TabContentsView here. | 289 #error Need to create your platform TabContentsView here. |
| 288 #endif | 290 #endif |
| 289 } | 291 } |
| 290 | 292 |
| 291 void ChromeContentBrowserClient::RenderViewHostCreated( | 293 void ChromeContentBrowserClient::RenderViewHostCreated( |
| 292 RenderViewHost* render_view_host) { | 294 RenderViewHost* render_view_host) { |
| 293 | 295 |
| (...skipping 819 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1113 #if defined(USE_NSS) | 1115 #if defined(USE_NSS) |
| 1114 crypto::CryptoModuleBlockingPasswordDelegate* | 1116 crypto::CryptoModuleBlockingPasswordDelegate* |
| 1115 ChromeContentBrowserClient::GetCryptoPasswordDelegate( | 1117 ChromeContentBrowserClient::GetCryptoPasswordDelegate( |
| 1116 const GURL& url) { | 1118 const GURL& url) { |
| 1117 return browser::NewCryptoModuleBlockingDialogDelegate( | 1119 return browser::NewCryptoModuleBlockingDialogDelegate( |
| 1118 browser::kCryptoModulePasswordKeygen, url.host()); | 1120 browser::kCryptoModulePasswordKeygen, url.host()); |
| 1119 } | 1121 } |
| 1120 #endif | 1122 #endif |
| 1121 | 1123 |
| 1122 } // namespace chrome | 1124 } // namespace chrome |
| OLD | NEW |