diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-24 16:51:32 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-24 16:51:32 +0000 |
| commit | 74313b42bc318d78d12ff3f322bb79d61d4a87af (patch) | |
| tree | 5dd1832bafee82fdd5094612be12f04ca7a41b89 /chrome/browser/chrome_content_browser_client.cc | |
| parent | 08107faa3479caaf8350e6af3a55b87ee1608b52 (diff) | |
| download | chromium_src-74313b42bc318d78d12ff3f322bb79d61d4a87af.zip chromium_src-74313b42bc318d78d12ff3f322bb79d61d4a87af.tar.gz chromium_src-74313b42bc318d78d12ff3f322bb79d61d4a87af.tar.bz2 | |
Get rid of static TabContentsView::Create function since the interface is in content, but the implementations are in chrome. Instead ask the embedder to create a TabContentsView.
BUG=76697
Review URL: http://codereview.chromium.org/7717011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98059 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chrome_content_browser_client.cc')
| -rw-r--r-- | chrome/browser/chrome_content_browser_client.cc | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index 6c330ac..41280f9 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -61,6 +61,7 @@ #include "content/browser/ssl/ssl_cert_error_handler.h" #include "content/browser/ssl/ssl_client_auth_handler.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/browser/tab_contents/tab_contents_view.h" #include "content/browser/worker_host/worker_process_host.h" #include "content/common/desktop_notification_messages.h" #include "grit/ui_resources.h" @@ -73,6 +74,16 @@ #include "chrome/browser/crash_handler_host_linux.h" #endif +#if defined(TOOLKIT_VIEWS) +#include "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h" +#elif defined(OS_LINUX) +#include "chrome/browser/tab_contents/tab_contents_view_gtk.h" +#elif defined(OS_MACOSX) +#include "chrome/browser/tab_contents/tab_contents_view_mac.h" +#elif defined(TOUCH_UI) +#include "chrome/browser/ui/views/tab_contents/tab_contents_view_touch.h" +#endif + #if defined(USE_NSS) #include "chrome/browser/ui/crypto_module_password_dialog.h" #endif @@ -100,6 +111,21 @@ static bool HandleWebUI(GURL* url, content::BrowserContext* browser_context) { namespace chrome { +TabContentsView* ChromeContentBrowserClient::CreateTabContentsView( + TabContents* tab_contents) { +#if defined(TOOLKIT_VIEWS) + return new TabContentsViewViews(tab_contents); +#elif defined(OS_LINUX) + return new TabContentsViewGtk(tab_contents); +#elif defined(OS_MACOSX) + return tab_contents_view_mac::CreateTabContentsView(tab_contents); +#elif defined(TOUCH_UI) + return new TabContentsViewTouch(tab_contents); +#else +#error Need to create your platform TabContentsView here. +#endif +} + void ChromeContentBrowserClient::RenderViewHostCreated( RenderViewHost* render_view_host) { new ChromeRenderViewHostObserver(render_view_host); |