diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-24 17:05:20 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-24 17:05:20 +0000 |
| commit | bb6dcbba1c7c617e8cd3e34f5f79e9c6253a6fc2 (patch) | |
| tree | ef077746124186a9f3713262d86bdcb0c41598d0 /chrome/browser/chrome_content_browser_client.cc | |
| parent | 48021c297d1262cf2aad21e5b2ca8213a84a2634 (diff) | |
| download | chromium_src-bb6dcbba1c7c617e8cd3e34f5f79e9c6253a6fc2.zip chromium_src-bb6dcbba1c7c617e8cd3e34f5f79e9c6253a6fc2.tar.gz chromium_src-bb6dcbba1c7c617e8cd3e34f5f79e9c6253a6fc2.tar.bz2 | |
Fix Touch build
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98061 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 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index 41280f9..6c14cd8 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -74,14 +74,14 @@ #include "chrome/browser/crash_handler_host_linux.h" #endif -#if defined(TOOLKIT_VIEWS) +#if defined(TOUCH_UI) +#include "chrome/browser/ui/views/tab_contents/tab_contents_view_touch.h" +#elif 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) @@ -113,14 +113,14 @@ namespace chrome { TabContentsView* ChromeContentBrowserClient::CreateTabContentsView( TabContents* tab_contents) { -#if defined(TOOLKIT_VIEWS) +#if defined(TOUCH_UI) + return new TabContentsViewTouch(tab_contents); +#elif 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 |