summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions
diff options
context:
space:
mode:
authorsadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-15 23:04:46 +0000
committersadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-15 23:04:46 +0000
commitaa042406ccff58edb414117877b669b5ca2d7a32 (patch)
tree28a5402971cc92fd823fdffb00d3da2c296b568c /chrome/browser/extensions
parentcd7873e5c84ea20560fed5c1a95fc1fdf17eb77a (diff)
downloadchromium_src-aa042406ccff58edb414117877b669b5ca2d7a32.zip
chromium_src-aa042406ccff58edb414117877b669b5ca2d7a32.tar.gz
chromium_src-aa042406ccff58edb414117877b669b5ca2d7a32.tar.bz2
touch: Fix extension popups.
For touch, GotFocus is called when the view already has focus, so it is not necessary to request the focus again. BUG=none TEST=ExtensionApiTest.GetViews Review URL: http://codereview.chromium.org/6480072 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75026 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
-rw-r--r--chrome/browser/extensions/extension_host.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_host.cc b/chrome/browser/extensions/extension_host.cc
index be92d80..74ca032 100644
--- a/chrome/browser/extensions/extension_host.cc
+++ b/chrome/browser/extensions/extension_host.cc
@@ -686,7 +686,7 @@ void ExtensionHost::UpdateDragCursor(WebDragOperation operation) {
}
void ExtensionHost::GotFocus() {
-#if defined(TOOLKIT_VIEWS)
+#if defined(TOOLKIT_VIEWS) && !defined(TOUCH_UI)
// Request focus so that the FocusManager has a focused view and can perform
// normally its key event processing (so that it lets tab key events go to the
// renderer).