diff options
| author | oshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-12 22:48:37 +0000 |
|---|---|---|
| committer | oshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-12 22:48:37 +0000 |
| commit | a2d2ebb2bebebb570439c39e8eb5f6940dd2f788 (patch) | |
| tree | 1ba145974abb0bb91cf4a9b63a79ca15909a9277 /chrome/browser/chrome_content_browser_client.cc | |
| parent | afb56b486dd195e57a9b412fcb0b77cc7ac711e7 (diff) | |
| download | chromium_src-a2d2ebb2bebebb570439c39e8eb5f6940dd2f788.zip chromium_src-a2d2ebb2bebebb570439c39e8eb5f6940dd2f788.tar.gz chromium_src-a2d2ebb2bebebb570439c39e8eb5f6940dd2f788.tar.bz2 | |
Use TabContentsViewViews for RenderWidgetHostViweViews.
* Removed TabContentsViewTouch.
* Changed so that mouse and resize event goes through NativeWidgetViews so that NativeTabContentsViewViews can invoke NativeTabContentsViewDelegates.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7460001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100792 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 | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index 1df60b6..5a42dde 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -76,9 +76,7 @@ #include "chrome/browser/crash_handler_host_linux.h" #endif -#if defined(TOUCH_UI) -#include "chrome/browser/ui/views/tab_contents/tab_contents_view_touch.h" -#elif defined(TOOLKIT_VIEWS) +#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" @@ -137,9 +135,7 @@ content::BrowserMainParts* ChromeContentBrowserClient::CreateBrowserMainParts( TabContentsView* ChromeContentBrowserClient::CreateTabContentsView( TabContents* tab_contents) { -#if defined(TOUCH_UI) - return new TabContentsViewTouch(tab_contents); -#elif defined(TOOLKIT_VIEWS) +#if defined(TOOLKIT_VIEWS) return new TabContentsViewViews(tab_contents); #elif defined(OS_LINUX) return new TabContentsViewGtk(tab_contents); |