commit 213be0c4a97cfb388450aaf48693678a3e3492fd
author Patrick Scott <phanna@android.com> Thu Nov 19 11:52:49 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Nov 19 11:52:49 2009 -0800
tree 2aa2c1f3a1d7db64f22fe2a2af5201b82fec89b7
parent 28292bc903909245339baa36890c04286ef31a4d
parent 4af206a6f656a27cfd4004241e1b84e05489eb94

am 4af206a6: Merge change Ia964056a into eclair-mr2

Merge commit '4af206a6f656a27cfd4004241e1b84e05489eb94' into eclair-mr2-plus-aosp

* commit '4af206a6f656a27cfd4004241e1b84e05489eb94':
  Revert "Do not allow javascript to change window focus."

src/com/android/browser/Tab.java

diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java
index 447e6be..3bb136c 100644
--- a/src/com/android/browser/Tab.java
+++ b/src/com/android/browser/Tab.java
@@ -660,6 +660,14 @@
         }
 
         @Override
+        public void onRequestFocus(WebView view) {
+            if (!mInForeground) {
+                mActivity.switchToTab(mActivity.getTabControl().getTabIndex(
+                        Tab.this));
+            }
+        }
+
+        @Override
         public void onCloseWindow(WebView window) {
             if (mParentTab != null) {
                 // JavaScript can only close popup window.