commit 7ab41fa8f2a0c8abf159279f9ea3cd8d61047893
author Patrick Scott <phanna@android.com> Sun Nov 15 13:16:38 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Sun Nov 15 13:16:38 2009 -0800
tree 76de9923021ef5811e17316c53a93ca789c2ee30
parent 628b1f4c80defbb83f7c5aac3e128b163571bae1
parent 62b3950cdbcf29b85a9d248cdebfa856ad89f74c

am 62b3950c: am 5b75cd02: Merge change I9861276c into eclair-mr2

Merge commit '62b3950cdbcf29b85a9d248cdebfa856ad89f74c'

* commit '62b3950cdbcf29b85a9d248cdebfa856ad89f74c':
  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 3bb136c..447e6be 100644
--- a/src/com/android/browser/Tab.java
+++ b/src/com/android/browser/Tab.java
@@ -660,14 +660,6 @@
         }
 
         @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.