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

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

Issue 9586009: Move TabContentsViewGtk's delegate to content\public\browser. Also name it a delegate instead of a … (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 9 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
« no previous file with comments | « no previous file | chrome/browser/tab_contents/chrome_tab_contents_view_wrapper_gtk.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 #endif 116 #endif
117 117
118 #if defined(OS_LINUX) || defined(OS_OPENBSD) 118 #if defined(OS_LINUX) || defined(OS_OPENBSD)
119 #include "base/linux_util.h" 119 #include "base/linux_util.h"
120 #include "chrome/browser/crash_handler_host_linux.h" 120 #include "chrome/browser/crash_handler_host_linux.h"
121 #endif 121 #endif
122 122
123 #if defined(TOOLKIT_VIEWS) 123 #if defined(TOOLKIT_VIEWS)
124 #include "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h" 124 #include "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h"
125 #elif defined(TOOLKIT_USES_GTK) 125 #elif defined(TOOLKIT_USES_GTK)
126 #include "chrome/browser/tab_contents/chrome_tab_contents_view_wrapper_gtk.h" 126 #include "chrome/browser/tab_contents/chrome_web_contents_view_gtk_delegate.h"
127 #include "content/browser/tab_contents/tab_contents_view_gtk.h" 127 #include "content/browser/tab_contents/tab_contents_view_gtk.h"
128 #elif defined(OS_MACOSX) 128 #elif defined(OS_MACOSX)
129 #include "chrome/browser/tab_contents/chrome_web_contents_view_mac_delegate.h" 129 #include "chrome/browser/tab_contents/chrome_web_contents_view_mac_delegate.h"
130 #include "content/browser/tab_contents/web_contents_view_mac.h" 130 #include "content/browser/tab_contents/web_contents_view_mac.h"
131 #elif defined(OS_ANDROID) 131 #elif defined(OS_ANDROID)
132 #include "content/browser/tab_contents/web_contents_view_android.h" 132 #include "content/browser/tab_contents/web_contents_view_android.h"
133 #endif 133 #endif
134 134
135 #if defined(USE_NSS) 135 #if defined(USE_NSS)
136 #include "chrome/browser/ui/crypto_module_password_dialog.h" 136 #include "chrome/browser/ui/crypto_module_password_dialog.h"
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 339
340 return main_parts; 340 return main_parts;
341 } 341 }
342 342
343 content::WebContentsView* ChromeContentBrowserClient::CreateWebContentsView( 343 content::WebContentsView* ChromeContentBrowserClient::CreateWebContentsView(
344 WebContents* web_contents) { 344 WebContents* web_contents) {
345 #if defined(TOOLKIT_VIEWS) 345 #if defined(TOOLKIT_VIEWS)
346 return new TabContentsViewViews(web_contents); 346 return new TabContentsViewViews(web_contents);
347 #elif defined(TOOLKIT_USES_GTK) 347 #elif defined(TOOLKIT_USES_GTK)
348 return new content::TabContentsViewGtk(web_contents, 348 return new content::TabContentsViewGtk(web_contents,
349 new ChromeTabContentsViewWrapperGtk); 349 new ChromeWebContentsViewGtkDelegate);
350 #elif defined(OS_MACOSX) 350 #elif defined(OS_MACOSX)
351 return web_contents_view_mac::CreateWebContentsView( 351 return web_contents_view_mac::CreateWebContentsView(
352 web_contents, 352 web_contents,
353 chrome_web_contents_view_mac_delegate::CreateWebContentsViewMacDelegate( 353 chrome_web_contents_view_mac_delegate::CreateWebContentsViewMacDelegate(
354 web_contents)); 354 web_contents));
355 #elif defined(OS_ANDROID) 355 #elif defined(OS_ANDROID)
356 return new WebContentsViewAndroid(web_contents); 356 return new WebContentsViewAndroid(web_contents);
357 #else 357 #else
358 #error Need to create your platform WebContentsView here. 358 #error Need to create your platform WebContentsView here.
359 #endif 359 #endif
(...skipping 1157 matching lines...) Expand 10 before | Expand all | Expand 10 after
1517 #if defined(USE_NSS) 1517 #if defined(USE_NSS)
1518 crypto::CryptoModuleBlockingPasswordDelegate* 1518 crypto::CryptoModuleBlockingPasswordDelegate*
1519 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 1519 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
1520 const GURL& url) { 1520 const GURL& url) {
1521 return browser::NewCryptoModuleBlockingDialogDelegate( 1521 return browser::NewCryptoModuleBlockingDialogDelegate(
1522 browser::kCryptoModulePasswordKeygen, url.host()); 1522 browser::kCryptoModulePasswordKeygen, url.host());
1523 } 1523 }
1524 #endif 1524 #endif
1525 1525
1526 } // namespace chrome 1526 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/tab_contents/chrome_tab_contents_view_wrapper_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698