4 files changed, 0 insertions, 19 deletions
diff --git a/WebCore/page/Chrome.cpp b/WebCore/page/Chrome.cpp
index 799aaee..0124211 100644
--- a/WebCore/page/Chrome.cpp
+++ b/WebCore/page/Chrome.cpp
@@ -138,17 +138,10 @@ float Chrome::scaleFactor()
     return m_client->scaleFactor();
 }
 
-#ifdef ANDROID_USER_GESTURE
-void Chrome::focus(bool userGesture) const
-{
-    m_client->focus(userGesture);
-}
-#else
 void Chrome::focus() const
 {
     m_client->focus();
 }
-#endif
 
 void Chrome::unfocus() const
 {
diff --git a/WebCore/page/Chrome.h b/WebCore/page/Chrome.h
index 3882f5e..88035a5 100644
--- a/WebCore/page/Chrome.h
+++ b/WebCore/page/Chrome.h
@@ -81,11 +81,7 @@ namespace WebCore {
         
         float scaleFactor();
 
-#ifdef ANDROID_USER_GESTURE
-        void focus(bool userGesture) const;
-#else
         void focus() const;
-#endif
         void unfocus() const;
 
         bool canTakeFocus(FocusDirection) const;
diff --git a/WebCore/page/ChromeClient.h b/WebCore/page/ChromeClient.h
index 660ec68..64b9f26 100644
--- a/WebCore/page/ChromeClient.h
+++ b/WebCore/page/ChromeClient.h
@@ -79,11 +79,7 @@ namespace WebCore {
         
         virtual float scaleFactor() = 0;
     
-#ifdef ANDROID_USER_GESTURE
-        virtual void focus(bool userGesture) = 0;
-#else
         virtual void focus() = 0;
-#endif
         virtual void unfocus() = 0;
 
         virtual bool canTakeFocus(FocusDirection) = 0;
diff --git a/WebCore/page/DOMWindow.cpp b/WebCore/page/DOMWindow.cpp
index f050a80..6ecde3c 100644
--- a/WebCore/page/DOMWindow.cpp
+++ b/WebCore/page/DOMWindow.cpp
@@ -779,11 +779,7 @@ void DOMWindow::focus()
 
     // If we're a top level window, bring the window to the front.
     if (m_frame == page->mainFrame())
-#ifdef ANDROID_USER_GESTURE
-        page->chrome()->focus(m_frame->loader()->isProcessingUserGesture());
-#else
         page->chrome()->focus();
-#endif
 
     if (!m_frame)
         return;