diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-20 21:50:06 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-20 21:50:06 +0000 |
| commit | a0c33d1073c9f10672aef2ab6e2eec4eb712827e (patch) | |
| tree | 691ab843e608d981d1f41f8af3736ba4bddc950e | |
| parent | 52194b7878a80b15ea3fd81a190aa360d6a9da6f (diff) | |
| download | chromium_src-a0c33d1073c9f10672aef2ab6e2eec4eb712827e.zip chromium_src-a0c33d1073c9f10672aef2ab6e2eec4eb712827e.tar.gz chromium_src-a0c33d1073c9f10672aef2ab6e2eec4eb712827e.tar.bz2 | |
aura: Keep using the non-aura RWHV stuff for touchui.
BUG=none
TEST=manually
Review URL: http://codereview.chromium.org/8364021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106592 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/views/tab_contents/native_tab_contents_container_aura.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/ui/views/tab_contents/native_tab_contents_container_aura.cc b/chrome/browser/ui/views/tab_contents/native_tab_contents_container_aura.cc index 476b2b8..3a7749a 100644 --- a/chrome/browser/ui/views/tab_contents/native_tab_contents_container_aura.cc +++ b/chrome/browser/ui/views/tab_contents/native_tab_contents_container_aura.cc @@ -139,7 +139,10 @@ gfx::NativeViewAccessible // static NativeTabContentsContainer* NativeTabContentsContainer::CreateNativeContainer( TabContentsContainer* container) { - // return new NativeTabContentsContainerViews(container); +#if defined(TOUCH_UI) + return new NativeTabContentsContainerViews(container); +#else // TODO(beng): switch this over once we're using this container. return new NativeTabContentsContainerAura(container); +#endif } |