diff options
| author | anicolao@chromium.org <anicolao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-30 21:40:08 +0000 |
|---|---|---|
| committer | anicolao@chromium.org <anicolao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-30 21:40:08 +0000 |
| commit | ee520884a87f24a5e34ef660657d49f2ec993f6e (patch) | |
| tree | a0d3cdd0fd986d3ea5aacdc5592adcbb2eef87b3 /views | |
| parent | 9eeb35e21e43c6a91fe45b03feb9cf1d42b88b65 (diff) | |
| download | chromium_src-ee520884a87f24a5e34ef660657d49f2ec993f6e.zip chromium_src-ee520884a87f24a5e34ef660657d49f2ec993f6e.tar.gz chromium_src-ee520884a87f24a5e34ef660657d49f2ec993f6e.tar.bz2 | |
Working on removing GTK for touch UI, by introducing a new
RenderWidgetHostViewViews class to replace RenderWidgetHostViewGtk in
the case of TOUCH_UI. This change shouldn't affect non-TOUCH_UI builds
and is not yet complete for a number of event types and corner cases,
but is sufficient to get in so that work on the touch keyboard and touch
events can proceed in parallel with GTK removal.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/3415005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61118 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/widget/root_view.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/views/widget/root_view.cc b/views/widget/root_view.cc index a9c2484..91d639c 100644 --- a/views/widget/root_view.cc +++ b/views/widget/root_view.cc @@ -611,6 +611,12 @@ View* RootView::GetFocusedView() { View* view = focus_manager->GetFocusedView(); if (view && (view->GetRootView() == this)) return view; +#if defined(TOUCH_UI) + // hack to deal with two root views in touch + // should be fixed by eliminating one of them + if (view) + return view; +#endif return NULL; } |