Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(194)

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 9307063: Split TabContentsViewMac. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: update Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 #include "base/linux_util.h" 115 #include "base/linux_util.h"
116 #include "chrome/browser/crash_handler_host_linux.h" 116 #include "chrome/browser/crash_handler_host_linux.h"
117 #endif 117 #endif
118 118
119 #if defined(TOOLKIT_VIEWS) 119 #if defined(TOOLKIT_VIEWS)
120 #include "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h" 120 #include "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h"
121 #elif defined(TOOLKIT_USES_GTK) 121 #elif defined(TOOLKIT_USES_GTK)
122 #include "chrome/browser/tab_contents/chrome_tab_contents_view_wrapper_gtk.h" 122 #include "chrome/browser/tab_contents/chrome_tab_contents_view_wrapper_gtk.h"
123 #include "content/browser/tab_contents/tab_contents_view_gtk.h" 123 #include "content/browser/tab_contents/tab_contents_view_gtk.h"
124 #elif defined(OS_MACOSX) 124 #elif defined(OS_MACOSX)
125 #include "chrome/browser/tab_contents/chrome_web_contents_view_mac_delegate.h"
125 #include "chrome/browser/tab_contents/moving_to_content/tab_contents_view_mac.h" 126 #include "chrome/browser/tab_contents/moving_to_content/tab_contents_view_mac.h"
126 #endif 127 #endif
127 128
128 #if defined(USE_NSS) 129 #if defined(USE_NSS)
129 #include "chrome/browser/ui/crypto_module_password_dialog.h" 130 #include "chrome/browser/ui/crypto_module_password_dialog.h"
130 #endif 131 #endif
131 132
132 using content::AccessTokenStore; 133 using content::AccessTokenStore;
133 using content::BrowserThread; 134 using content::BrowserThread;
134 using content::SiteInstance; 135 using content::SiteInstance;
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
305 } 306 }
306 307
307 content::WebContentsView* ChromeContentBrowserClient::CreateWebContentsView( 308 content::WebContentsView* ChromeContentBrowserClient::CreateWebContentsView(
308 WebContents* web_contents) { 309 WebContents* web_contents) {
309 #if defined(TOOLKIT_VIEWS) 310 #if defined(TOOLKIT_VIEWS)
310 return new TabContentsViewViews(web_contents); 311 return new TabContentsViewViews(web_contents);
311 #elif defined(TOOLKIT_USES_GTK) 312 #elif defined(TOOLKIT_USES_GTK)
312 return new content::TabContentsViewGtk(web_contents, 313 return new content::TabContentsViewGtk(web_contents,
313 new ChromeTabContentsViewWrapperGtk); 314 new ChromeTabContentsViewWrapperGtk);
314 #elif defined(OS_MACOSX) 315 #elif defined(OS_MACOSX)
315 return tab_contents_view_mac::CreateWebContentsView(web_contents); 316 return tab_contents_view_mac::CreateWebContentsView(
317 web_contents,
318 chrome_web_contents_view_mac_delegate::CreateWebContentsViewMacDelegate(
319 web_contents));
316 #else 320 #else
317 #error Need to create your platform WebContentsView here. 321 #error Need to create your platform WebContentsView here.
318 #endif 322 #endif
319 } 323 }
320 324
321 void ChromeContentBrowserClient::RenderViewHostCreated( 325 void ChromeContentBrowserClient::RenderViewHostCreated(
322 RenderViewHost* render_view_host) { 326 RenderViewHost* render_view_host) {
323 327
324 SiteInstance* site_instance = render_view_host->site_instance(); 328 SiteInstance* site_instance = render_view_host->site_instance();
325 Profile* profile = Profile::FromBrowserContext( 329 Profile* profile = Profile::FromBrowserContext(
(...skipping 1125 matching lines...) Expand 10 before | Expand all | Expand 10 after
1451 #if defined(USE_NSS) 1455 #if defined(USE_NSS)
1452 crypto::CryptoModuleBlockingPasswordDelegate* 1456 crypto::CryptoModuleBlockingPasswordDelegate*
1453 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 1457 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
1454 const GURL& url) { 1458 const GURL& url) {
1455 return browser::NewCryptoModuleBlockingDialogDelegate( 1459 return browser::NewCryptoModuleBlockingDialogDelegate(
1456 browser::kCryptoModulePasswordKeygen, url.host()); 1460 browser::kCryptoModulePasswordKeygen, url.host());
1457 } 1461 }
1458 #endif 1462 #endif
1459 1463
1460 } // namespace chrome 1464 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698