diff options
| author | oshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-13 01:37:35 +0000 |
|---|---|---|
| committer | oshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-13 01:37:35 +0000 |
| commit | caee17863b73aa083656381a918a98e76d93b61f (patch) | |
| tree | 37621788206406eac0fd880fe31e4639be79164a /chrome/browser/ui/views/dom_view.cc | |
| parent | 86da286163563a0c1fd3079e677289b2ebc8a932 (diff) | |
| download | chromium_src-caee17863b73aa083656381a918a98e76d93b61f.zip chromium_src-caee17863b73aa083656381a918a98e76d93b61f.tar.gz chromium_src-caee17863b73aa083656381a918a98e76d93b61f.tar.bz2 | |
Relanding 100792
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
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=100792
Review URL: http://codereview.chromium.org/7460001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100834 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/views/dom_view.cc')
| -rw-r--r-- | chrome/browser/ui/views/dom_view.cc | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/chrome/browser/ui/views/dom_view.cc b/chrome/browser/ui/views/dom_view.cc index 4555bd1..6f90426 100644 --- a/chrome/browser/ui/views/dom_view.cc +++ b/chrome/browser/ui/views/dom_view.cc @@ -6,12 +6,10 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/renderer_preferences_util.h" +#include "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h" #include "content/browser/tab_contents/tab_contents.h" #include "views/focus/focus_manager.h" - -#if defined(TOUCH_UI) -#include "chrome/browser/ui/views/tab_contents/tab_contents_view_touch.h" -#endif +#include "views/widget/native_widget_views.h" // static const char DOMView::kViewClassName[] = @@ -81,9 +79,13 @@ void DOMView::ViewHierarchyChanged(bool is_add, views::View* parent, } void DOMView::AttachTabContents() { -#if defined(TOUCH_UI) - AttachToView(static_cast<TabContentsViewTouch*>(tab_contents_->view())); -#else - Attach(tab_contents_->GetNativeView()); -#endif + if (views::Widget::IsPureViews()) { + TabContentsViewViews* widget = + static_cast<TabContentsViewViews*>(tab_contents_->view()); + views::NativeWidgetViews* nwv = + static_cast<views::NativeWidgetViews*>(widget->native_widget()); + AttachToView(nwv->GetView()); + } else { + Attach(tab_contents_->GetNativeView()); + } } |