ui: Android changes.

A series of changes related to android code organization under ui, that came
after the discussion in https://codereview.chromium.org/62203014/.

- Rename ui_jni_registrar.* to ui_base_jni_registrar.*
- Create a base/ directory under ui/android/java/src/org/chromium/ui, and move
some java files there.
- Move Surface java files into ui/android/java/src/org/chromium/ui/gl/ directory.
- Rename ui_jni_headers to ui_base_jni_headers.
- Create a new ui_android.gyp file under ui/android to contain ui_java target.

BUG=299841
R=tedchoc@chromium.org, yfriedman@chromium.org
TBR=ben

Review URL: https://codereview.chromium.org/70843003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235369 0039d316-1c4b-4281-b951-d872f2087c98

50 files changed, 128 insertions, 116 deletions

diff --git a/android_webview/all_webview.gyp b/android_webview/all_webview.gyp
index bd46f26..e411a87 100644
--- a/android_webview/all_webview.gyp
+++ b/android_webview/all_webview.gyp
@@ -25,7 +25,7 @@
         '../net/net.gyp:cert_verify_result_android_java',
         '../net/net.gyp:net_errors_java',
         '../net/net.gyp:private_key_types_java',
-        '../ui/ui.gyp:window_open_disposition_java',
+        '../ui/android/ui_android.gyp:window_open_disposition_java',
       ],
     }, # target_name: All
   ],  # targets
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp
index 2d1d8db..6cfe557 100644
--- a/android_webview/android_webview.gyp
+++ b/android_webview/android_webview.gyp
@@ -213,7 +213,7 @@
         '../components/components.gyp:navigation_interception_java',
         '../components/components.gyp:web_contents_delegate_android_java',
         '../content/content.gyp:content_java',
-        '../ui/ui.gyp:ui_java',
+        '../ui/android/ui_android.gyp:ui_java',
       ],
       'variables': {
         'java_in_dir': '../android_webview/java',
diff --git a/android_webview/android_webview_tests.gypi b/android_webview/android_webview_tests.gypi
index ffbd8e5..5885571 100644
--- a/android_webview/android_webview_tests.gypi
+++ b/android_webview/android_webview_tests.gypi
@@ -72,7 +72,7 @@
         '../testing/android/native_test.gyp:native_test_native_code',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
-        '../ui/ui.gyp:ui_jni_headers',
+        '../ui/ui.gyp:ui_base_jni_headers',
         'android_webview_common',
       ],
       'include_dirs': [
diff --git a/android_webview/java/src/org/chromium/android_webview/AwContents.java b/android_webview/java/src/org/chromium/android_webview/AwContents.java
index 16485ef..edc2347 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwContents.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java
@@ -48,8 +48,8 @@ import org.chromium.content.browser.LoadUrlParams;
 import org.chromium.content.browser.NavigationHistory;
 import org.chromium.content.browser.PageTransitionTypes;
 import org.chromium.content.common.CleanupReference;
-import org.chromium.ui.ActivityWindowAndroid;
-import org.chromium.ui.WindowAndroid;
+import org.chromium.ui.base.ActivityWindowAndroid;
+import org.chromium.ui.base.WindowAndroid;
 import org.chromium.ui.gfx.DeviceDisplayInfo;
 
 import java.io.File;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/JavascriptAppModalDialog.java b/chrome/android/java/src/org/chromium/chrome/browser/JavascriptAppModalDialog.java
index b6d2f40..7bbfb90 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/JavascriptAppModalDialog.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/JavascriptAppModalDialog.java
@@ -20,7 +20,7 @@ import com.google.common.annotations.VisibleForTesting;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.chrome.R;
-import org.chromium.ui.WindowAndroid;
+import org.chromium.ui.base.WindowAndroid;
 
 public class JavascriptAppModalDialog implements DialogInterface.OnClickListener {
     private static final String TAG = "JavascriptAppModalDialog";
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/NavigationPopup.java b/chrome/android/java/src/org/chromium/chrome/browser/NavigationPopup.java
index 99feda5..fa42755 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/NavigationPopup.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/NavigationPopup.java
@@ -25,7 +25,7 @@ import android.widget.TextView;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.ThreadUtils;
-import org.chromium.ui.LocalizationUtils;
+import org.chromium.ui.base.LocalizationUtils;
 import org.chromium.chrome.R;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content.browser.NavigationClient;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/TabBase.java b/chrome/android/java/src/org/chromium/chrome/browser/TabBase.java
index a881e84..4a92e04 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/TabBase.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/TabBase.java
@@ -22,7 +22,7 @@ import org.chromium.content.browser.NavigationClient;
 import org.chromium.content.browser.NavigationHistory;
 import org.chromium.content.browser.PageInfo;
 import org.chromium.content.browser.WebContentsObserverAndroid;
-import org.chromium.ui.WindowAndroid;
+import org.chromium.ui.base.WindowAndroid;
 
 import java.util.Iterator;
 import java.util.concurrent.atomic.AtomicInteger;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillDialogControllerAndroid.java b/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillDialogControllerAndroid.java
index 8213ad3..ab30ea0 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillDialogControllerAndroid.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillDialogControllerAndroid.java
@@ -8,7 +8,7 @@ import com.google.common.annotations.VisibleForTesting;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
-import org.chromium.ui.WindowAndroid;
+import org.chromium.ui.base.WindowAndroid;
 
 /**
  * Java-side AutofillDialog and AutofillDialogFactory interfaces, and
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillPopupGlue.java b/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillPopupGlue.java
index fc8f4ed..50a782d 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillPopupGlue.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillPopupGlue.java
@@ -6,9 +6,9 @@ package org.chromium.chrome.browser.autofill;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
-import org.chromium.ui.ViewAndroid;
-import org.chromium.ui.ViewAndroidDelegate;
-import org.chromium.ui.WindowAndroid;
+import org.chromium.ui.base.ViewAndroidDelegate;
+import org.chromium.ui.base.ViewAndroid;
+import org.chromium.ui.base.WindowAndroid;
 import org.chromium.ui.autofill.AutofillPopup;
 import org.chromium.ui.autofill.AutofillPopup.AutofillPopupDelegate;
 import org.chromium.ui.autofill.AutofillSuggestion;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarLayout.java
index 2e8b659..08ca92e 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarLayout.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarLayout.java
@@ -17,7 +17,7 @@ import android.widget.TextView;
 
 import org.chromium.chrome.R;
 
-import org.chromium.ui.LocalizationUtils;
+import org.chromium.ui.base.LocalizationUtils;
 
 import java.util.ArrayList;
 
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillTest.java
index 60ab606..1a8e6e1 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillTest.java
@@ -13,9 +13,9 @@ import org.chromium.content.browser.test.util.TouchCommon;
 import org.chromium.content.browser.test.util.UiUtils;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
-import org.chromium.ui.ActivityWindowAndroid;
-import org.chromium.ui.ViewAndroidDelegate;
-import org.chromium.ui.WindowAndroid;
+import org.chromium.ui.base.ActivityWindowAndroid;
+import org.chromium.ui.base.ViewAndroidDelegate;
+import org.chromium.ui.base.WindowAndroid;
 import org.chromium.ui.autofill.AutofillPopup;
 import org.chromium.ui.autofill.AutofillPopup.AutofillPopupDelegate;
 import org.chromium.ui.autofill.AutofillSuggestion;
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/MockAutofillDialogController.java b/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/MockAutofillDialogController.java
index cc69d25..215ad43 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/MockAutofillDialogController.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/MockAutofillDialogController.java
@@ -12,7 +12,7 @@ import org.chromium.chrome.browser.autofill.AutofillDialogControllerAndroid.Auto
 import org.chromium.chrome.browser.autofill.AutofillDialogControllerAndroid.AutofillDialogDelegate;
 import org.chromium.chrome.browser.autofill.AutofillDialogControllerAndroid.AutofillDialogFactory;
 import org.chromium.chrome.browser.autofill.AutofillDialogResult;
-import org.chromium.ui.WindowAndroid;
+import org.chromium.ui.base.WindowAndroid;
 
 /**
  * Mock of the AutofillDialog that returns a predefined set of values.
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/input/SelectPopupOtherContentViewTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/input/SelectPopupOtherContentViewTest.java
index 0d005c5..52770a3 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/input/SelectPopupOtherContentViewTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/input/SelectPopupOtherContentViewTest.java
@@ -15,8 +15,8 @@ import org.chromium.content.browser.test.util.TestCallbackHelperContainer;
 import org.chromium.content.browser.test.util.UiUtils;
 import org.chromium.chrome.browser.ContentViewUtil;
 import org.chromium.chrome.testshell.ChromiumTestShellTestBase;
-import org.chromium.ui.ActivityWindowAndroid;
-import org.chromium.ui.WindowAndroid;
+import org.chromium.ui.base.ActivityWindowAndroid;
+import org.chromium.ui.base.WindowAndroid;
 
 public class SelectPopupOtherContentViewTest extends ChromiumTestShellTestBase {
     private static final int WAIT_TIMEOUT_SECONDS = 2;
diff --git a/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java b/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java
index 1e195cd..c5c65af 100644
--- a/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java
+++ b/chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.java
@@ -26,8 +26,8 @@ import org.chromium.content.browser.ContentViewClient;
 import org.chromium.content.browser.DeviceUtils;
 import org.chromium.content.common.CommandLine;
 import org.chromium.sync.signin.ChromeSigninController;
-import org.chromium.ui.ActivityWindowAndroid;
-import org.chromium.ui.WindowAndroid;
+import org.chromium.ui.base.ActivityWindowAndroid;
+import org.chromium.ui.base.WindowAndroid;
 
 /**
  * The {@link android.app.Activity} component of a basic test shell to test Chrome features.
diff --git a/chrome/android/testshell/java/src/org/chromium/chrome/testshell/TabManager.java b/chrome/android/testshell/java/src/org/chromium/chrome/testshell/TabManager.java
index 5b67539..f852d62 100644
--- a/chrome/android/testshell/java/src/org/chromium/chrome/testshell/TabManager.java
+++ b/chrome/android/testshell/java/src/org/chromium/chrome/testshell/TabManager.java
@@ -12,7 +12,7 @@ import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 
 import org.chromium.content.browser.ContentViewRenderView;
-import org.chromium.ui.WindowAndroid;
+import org.chromium.ui.base.WindowAndroid;
 
 /**
  * The TabManager hooks together all of the related {@link View}s that are used to represent
@@ -106,4 +106,4 @@ public class TabManager extends LinearLayout {
         mContentViewRenderView.setCurrentContentView(mCurrentTab.getContentView());
         mCurrentTab.getContentView().requestFocus();
     }
-}
\ No newline at end of file
+}
diff --git a/chrome/android/testshell/java/src/org/chromium/chrome/testshell/TestShellTab.java b/chrome/android/testshell/java/src/org/chromium/chrome/testshell/TestShellTab.java
index 6e55436..c19103c 100644
--- a/chrome/android/testshell/java/src/org/chromium/chrome/testshell/TestShellTab.java
+++ b/chrome/android/testshell/java/src/org/chromium/chrome/testshell/TestShellTab.java
@@ -12,7 +12,7 @@ import org.chromium.chrome.browser.infobar.AutoLoginProcessor;
 import org.chromium.content.browser.ContentView;
 import org.chromium.content.browser.LoadUrlParams;
 import org.chromium.content.common.CleanupReference;
-import org.chromium.ui.WindowAndroid;
+import org.chromium.ui.base.WindowAndroid;
 
 /**
  * TestShell's implementation of a tab. This mirrors how Chrome for Android subclasses
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 132bb3e..006c2f3 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1011,7 +1011,7 @@
             '../printing/printing.gyp:printing_java',
             '../sync/sync.gyp:sync_java',
             '../third_party/guava/guava.gyp:guava_javalib',
-            '../ui/ui.gyp:ui_java',
+            '../ui/android/ui_android.gyp:ui_java',
           ],
           'variables': {
             'java_in_dir': '../chrome/android/java',
diff --git a/chrome/test/base/chrome_test_suite.cc b/chrome/test/base/chrome_test_suite.cc
index a8453bf..8fb1ff7 100644
--- a/chrome/test/base/chrome_test_suite.cc
+++ b/chrome/test/base/chrome_test_suite.cc
@@ -36,7 +36,7 @@
 #include "base/android/jni_android.h"
 #include "chrome/browser/android/chrome_jni_registrar.h"
 #include "net/android/net_jni_registrar.h"
-#include "ui/base/android/ui_jni_registrar.h"
+#include "ui/base/android/ui_base_jni_registrar.h"
 #include "ui/gfx/android/gfx_jni_registrar.h"
 #include "ui/gl/android/gl_jni_registrar.h"
 #endif
diff --git a/components/dom_distiller/core/distiller_unittest.cc b/components/dom_distiller/core/distiller_unittest.cc
index 144b41e..faf24ad 100644
--- a/components/dom_distiller/core/distiller_unittest.cc
+++ b/components/dom_distiller/core/distiller_unittest.cc
@@ -20,7 +20,7 @@
 
 #if defined(OS_ANDROID)
 #include "base/android/jni_android.h"
-#include "ui/base/android/ui_jni_registrar.h"
+#include "ui/base/android/ui_base_jni_registrar.h"
 #include "ui/gfx/android/gfx_jni_registrar.h"
 #endif
 
diff --git a/content/app/android/library_loader_hooks.cc b/content/app/android/library_loader_hooks.cc
index a424748..837bfaa 100644
--- a/content/app/android/library_loader_hooks.cc
+++ b/content/app/android/library_loader_hooks.cc
@@ -27,7 +27,7 @@
 #include "jni/LibraryLoader_jni.h"
 #include "media/base/android/media_jni_registrar.h"
 #include "net/android/net_jni_registrar.h"
-#include "ui/base/android/ui_jni_registrar.h"
+#include "ui/base/android/ui_base_jni_registrar.h"
 #include "ui/gfx/android/gfx_jni_registrar.h"
 #include "ui/gl/android/gl_jni_registrar.h"
 #include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h"
diff --git a/content/content.gyp b/content/content.gyp
index 7e71474..d4d6533 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -392,7 +392,7 @@
             '../base/base.gyp:base',
             '../media/media.gyp:media_java',
             '../net/net.gyp:net',
-            '../ui/ui.gyp:ui_java',
+            '../ui/android/ui_android.gyp:ui_java',
             'common_aidl',
             'content_common',
             'page_transition_types_java',
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index 42d971a..9a5cd08 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -786,7 +786,7 @@
             '../media/media.gyp:media_java',
             '../net/net.gyp:net_java',
             '../tools/android/forwarder/forwarder.gyp:forwarder',
-            '../ui/ui.gyp:ui_java',
+            '../ui/android/ui_android.gyp:ui_java',
           ],
           'variables': {
             'apk_name': 'ContentShell',
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentView.java b/content/public/android/java/src/org/chromium/content/browser/ContentView.java
index dacfcbb..fb25e97 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ContentView.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentView.java
@@ -24,7 +24,7 @@ import android.widget.FrameLayout;
 import com.google.common.annotations.VisibleForTesting;
 
 import org.chromium.content.common.TraceEvent;
-import org.chromium.ui.WindowAndroid;
+import org.chromium.ui.base.WindowAndroid;
 
 /**
  * The containing view for {@link ContentViewCore} that exists in the Android UI hierarchy and
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
index dedf6c6..e6fd3e4 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
@@ -68,9 +68,9 @@ import org.chromium.content.browser.input.InsertionHandleController;
 import org.chromium.content.browser.input.SelectPopupDialog;
 import org.chromium.content.browser.input.SelectionHandleController;
 import org.chromium.content.common.TraceEvent;
-import org.chromium.ui.ViewAndroid;
-import org.chromium.ui.ViewAndroidDelegate;
-import org.chromium.ui.WindowAndroid;
+import org.chromium.ui.base.ViewAndroidDelegate;
+import org.chromium.ui.base.ViewAndroid;
+import org.chromium.ui.base.WindowAndroid;
 import org.chromium.ui.gfx.DeviceDisplayInfo;
 
 import java.lang.annotation.Annotation;
diff --git a/content/public/android/java/src/org/chromium/content/browser/JellyBeanContentView.java b/content/public/android/java/src/org/chromium/content/browser/JellyBeanContentView.java
index 7cca043..2508863 100644
--- a/content/public/android/java/src/org/chromium/content/browser/JellyBeanContentView.java
+++ b/content/public/android/java/src/org/chromium/content/browser/JellyBeanContentView.java
@@ -11,7 +11,7 @@ import android.view.View;
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.view.accessibility.AccessibilityNodeProvider;
 
-import org.chromium.ui.WindowAndroid;
+import org.chromium.ui.base.WindowAndroid;
 
 /**
  * A version of {@link ContentView} that supports JellyBean features.
diff --git a/content/public/android/java/src/org/chromium/content/browser/PowerSaveBlocker.java b/content/public/android/java/src/org/chromium/content/browser/PowerSaveBlocker.java
index 548c66d..3c561c3 100644
--- a/content/public/android/java/src/org/chromium/content/browser/PowerSaveBlocker.java
+++ b/content/public/android/java/src/org/chromium/content/browser/PowerSaveBlocker.java
@@ -5,7 +5,7 @@
 package org.chromium.content.browser;
 
 import org.chromium.base.CalledByNative;
-import org.chromium.ui.ViewAndroid;
+import org.chromium.ui.base.ViewAndroid;
 
 class PowerSaveBlocker {
     @CalledByNative
@@ -17,4 +17,4 @@ class PowerSaveBlocker {
     private static void removeBlock(ViewAndroid view) {
         view.decrementKeepScreenOnCount();
     }
-}
\ No newline at end of file
+}
diff --git a/content/public/android/java/src/org/chromium/content/browser/ResourceExtractor.java b/content/public/android/java/src/org/chromium/content/browser/ResourceExtractor.java
index 8a943f7..ab64574 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ResourceExtractor.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ResourceExtractor.java
@@ -14,7 +14,7 @@ import android.preference.PreferenceManager;
 import android.util.Log;
 
 import org.chromium.base.PathUtils;
-import org.chromium.ui.LocalizationUtils;
+import org.chromium.ui.base.LocalizationUtils;
 
 import java.io.File;
 import java.io.FileOutputStream;
diff --git a/content/public/test/content_test_suite_base.cc b/content/public/test/content_test_suite_base.cc
index 0532079..d7ba804 100644
--- a/content/public/test/content_test_suite_base.cc
+++ b/content/public/test/content_test_suite_base.cc
@@ -28,7 +28,7 @@
 #include "content/common/android/common_jni_registrar.h"
 #include "media/base/android/media_jni_registrar.h"
 #include "net/android/net_jni_registrar.h"
-#include "ui/base/android/ui_jni_registrar.h"
+#include "ui/base/android/ui_base_jni_registrar.h"
 #include "ui/gfx/android/gfx_jni_registrar.h"
 #include "ui/gl/android/gl_jni_registrar.h"
 #include "ui/shell_dialogs/android/shell_dialogs_jni_registrar.h"
diff --git a/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java b/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java
index b730a11..ef8f048 100644
--- a/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java
+++ b/content/shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java
@@ -16,8 +16,8 @@ import org.chromium.content.app.LibraryLoader;
 import org.chromium.content.browser.BrowserStartupController;
 import org.chromium.content.common.ProcessInitException;
 import org.chromium.content_shell.ShellManager;
-import org.chromium.ui.ActivityWindowAndroid;
-import org.chromium.ui.WindowAndroid;
+import org.chromium.ui.base.ActivityWindowAndroid;
+import org.chromium.ui.base.WindowAndroid;
 
 @JNINamespace("content")
 public class ContentBrowserTestsActivity extends Activity {
diff --git a/content/shell/android/java/src/org/chromium/content_shell/Shell.java b/content/shell/android/java/src/org/chromium/content_shell/Shell.java
index f97b323..05efd03 100644
--- a/content/shell/android/java/src/org/chromium/content_shell/Shell.java
+++ b/content/shell/android/java/src/org/chromium/content_shell/Shell.java
@@ -24,7 +24,7 @@ import org.chromium.base.JNINamespace;
 import org.chromium.content.browser.ContentView;
 import org.chromium.content.browser.ContentViewRenderView;
 import org.chromium.content.browser.LoadUrlParams;
-import org.chromium.ui.WindowAndroid;
+import org.chromium.ui.base.WindowAndroid;
 
 /**
  * Container for the various UI components that make up a shell window.
diff --git a/content/shell/android/java/src/org/chromium/content_shell/ShellManager.java b/content/shell/android/java/src/org/chromium/content_shell/ShellManager.java
index 2791442..a7e3037 100644
--- a/content/shell/android/java/src/org/chromium/content_shell/ShellManager.java
+++ b/content/shell/android/java/src/org/chromium/content_shell/ShellManager.java
@@ -13,7 +13,7 @@ import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
 import org.chromium.content.browser.ContentView;
 import org.chromium.content.browser.ContentViewRenderView;
-import org.chromium.ui.WindowAndroid;
+import org.chromium.ui.base.WindowAndroid;
 
 /**
  * Container and generator of ShellViews.
diff --git a/content/shell/android/linker_test_apk/src/org/chromium/content_linker_test_apk/ContentLinkerTestActivity.java b/content/shell/android/linker_test_apk/src/org/chromium/content_linker_test_apk/ContentLinkerTestActivity.java
index 87dfcb8..3d3cb90 100644
--- a/content/shell/android/linker_test_apk/src/org/chromium/content_linker_test_apk/ContentLinkerTestActivity.java
+++ b/content/shell/android/linker_test_apk/src/org/chromium/content_linker_test_apk/ContentLinkerTestActivity.java
@@ -21,8 +21,8 @@ import org.chromium.content.common.CommandLine;
 import org.chromium.content.common.ProcessInitException;
 import org.chromium.content_shell.Shell;
 import org.chromium.content_shell.ShellManager;
-import org.chromium.ui.ActivityWindowAndroid;
-import org.chromium.ui.WindowAndroid;
+import org.chromium.ui.base.ActivityWindowAndroid;
+import org.chromium.ui.base.WindowAndroid;
 
 public class ContentLinkerTestActivity extends Activity {
     public static final String COMMAND_LINE_FILE =
diff --git a/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java b/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java
index ddf5498..14c8d1c 100644
--- a/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java
+++ b/content/shell/android/shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java
@@ -24,8 +24,8 @@ import org.chromium.content.common.CommandLine;
 import org.chromium.content.common.ProcessInitException;
 import org.chromium.content_shell.Shell;
 import org.chromium.content_shell.ShellManager;
-import org.chromium.ui.ActivityWindowAndroid;
-import org.chromium.ui.WindowAndroid;
+import org.chromium.ui.base.ActivityWindowAndroid;
+import org.chromium.ui.base.WindowAndroid;
 
 /**
  * Activity for managing the Content Shell.
diff --git a/ui/android/java/src/org/chromium/ui/autofill/AutofillPopup.java b/ui/android/java/src/org/chromium/ui/autofill/AutofillPopup.java
index 1612f0b..f290c7e 100644
--- a/ui/android/java/src/org/chromium/ui/autofill/AutofillPopup.java
+++ b/ui/android/java/src/org/chromium/ui/autofill/AutofillPopup.java
@@ -21,7 +21,7 @@ import java.util.HashSet;
 import java.util.List;
 
 import org.chromium.ui.R;
-import org.chromium.ui.ViewAndroidDelegate;
+import org.chromium.ui.base.ViewAndroidDelegate;
 
 /**
  * The Autofill suggestion popup that lists relevant suggestions.
diff --git a/ui/android/java/src/org/chromium/ui/ActivityWindowAndroid.java b/ui/android/java/src/org/chromium/ui/base/ActivityWindowAndroid.java
index 190043a4..e5812df 100644
--- a/ui/android/java/src/org/chromium/ui/ActivityWindowAndroid.java
+++ b/ui/android/java/src/org/chromium/ui/base/ActivityWindowAndroid.java
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.ui;
+package org.chromium.ui.base;
 
 import android.app.Activity;
 import android.content.ActivityNotFoundException;
@@ -13,6 +13,8 @@ import android.graphics.Rect;
 import android.util.Log;
 import android.view.View;
 
+import org.chromium.ui.UiUtils;
+
 import java.io.ByteArrayOutputStream;
 
 /**
diff --git a/ui/android/java/src/org/chromium/ui/Clipboard.java b/ui/android/java/src/org/chromium/ui/base/Clipboard.java
index b4e0c21..e62c84a 100644
--- a/ui/android/java/src/org/chromium/ui/Clipboard.java
+++ b/ui/android/java/src/org/chromium/ui/base/Clipboard.java
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.ui;
+package org.chromium.ui.base;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
diff --git a/ui/android/java/src/org/chromium/ui/LocalizationUtils.java b/ui/android/java/src/org/chromium/ui/base/LocalizationUtils.java
index f421d89..2a2474f 100644
--- a/ui/android/java/src/org/chromium/ui/LocalizationUtils.java
+++ b/ui/android/java/src/org/chromium/ui/base/LocalizationUtils.java
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.ui;
+package org.chromium.ui.base;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
diff --git a/ui/android/java/src/org/chromium/ui/SelectFileDialog.java b/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java
index d313681..f495767 100644
--- a/ui/android/java/src/org/chromium/ui/SelectFileDialog.java
+++ b/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.ui;
+package org.chromium.ui.base;
 
 import android.app.Activity;
 import android.content.ContentResolver;
@@ -13,15 +13,16 @@ import android.os.Environment;
 import android.provider.MediaStore;
 import android.text.TextUtils;
 
+import org.chromium.base.CalledByNative;
+import org.chromium.base.JNINamespace;
+import org.chromium.ui.R;
+import org.chromium.ui.base.WindowAndroid;
+
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import org.chromium.base.CalledByNative;
-import org.chromium.base.JNINamespace;
-import org.chromium.ui.WindowAndroid;
-
 /**
  * A dialog that is triggered from a file input field that allows a user to select a file based on
  * a set of accepted file types. The path of the selected file is passed to the native dialog.
diff --git a/ui/android/java/src/org/chromium/ui/ViewAndroid.java b/ui/android/java/src/org/chromium/ui/base/ViewAndroid.java
index 694f421..e91911c 100644
--- a/ui/android/java/src/org/chromium/ui/ViewAndroid.java
+++ b/ui/android/java/src/org/chromium/ui/base/ViewAndroid.java
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.ui;
+package org.chromium.ui.base;
 
 import android.view.View;
 
 import org.chromium.base.JNINamespace;
-import org.chromium.ui.ViewAndroidDelegate;
-import org.chromium.ui.WindowAndroid;
+import org.chromium.ui.base.ViewAndroidDelegate;
+import org.chromium.ui.base.WindowAndroid;
 
 /**
  * From the Chromium architecture point of view, ViewAndroid and its native counterpart
diff --git a/ui/android/java/src/org/chromium/ui/ViewAndroidDelegate.java b/ui/android/java/src/org/chromium/ui/base/ViewAndroidDelegate.java
index 531dce8..34d280a 100644
--- a/ui/android/java/src/org/chromium/ui/ViewAndroidDelegate.java
+++ b/ui/android/java/src/org/chromium/ui/base/ViewAndroidDelegate.java
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.ui;
+package org.chromium.ui.base;
 
 import android.view.View;
 
@@ -31,4 +31,4 @@ public interface ViewAndroidDelegate {
      * @param anchorView The anchor view that needs to be released.
      */
     void releaseAnchorView(View anchorView);
-}
\ No newline at end of file
+}
diff --git a/ui/android/java/src/org/chromium/ui/WindowAndroid.java b/ui/android/java/src/org/chromium/ui/base/WindowAndroid.java
index 20bb64c..3c48272 100644
--- a/ui/android/java/src/org/chromium/ui/WindowAndroid.java
+++ b/ui/android/java/src/org/chromium/ui/base/WindowAndroid.java
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.ui;
+package org.chromium.ui.base;
 
 import android.content.ContentResolver;
 import android.content.Context;
diff --git a/ui/android/java/src/org/chromium/ui/gfx/SurfaceTextureListener.java b/ui/android/java/src/org/chromium/ui/gl/SurfaceTextureListener.java
index 7623f79..6e2d6fe 100644
--- a/ui/android/java/src/org/chromium/ui/gfx/SurfaceTextureListener.java
+++ b/ui/android/java/src/org/chromium/ui/gl/SurfaceTextureListener.java
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.ui.gfx;
+package org.chromium.ui.gl;
 
 import android.graphics.SurfaceTexture;
 
diff --git a/ui/android/java/src/org/chromium/ui/gfx/SurfaceTexturePlatformWrapper.java b/ui/android/java/src/org/chromium/ui/gl/SurfaceTexturePlatformWrapper.java
index 1e77f38..227c27f 100644
--- a/ui/android/java/src/org/chromium/ui/gfx/SurfaceTexturePlatformWrapper.java
+++ b/ui/android/java/src/org/chromium/ui/gl/SurfaceTexturePlatformWrapper.java
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.ui.gfx;
+package org.chromium.ui.gl;
 
 import android.graphics.SurfaceTexture;
 import android.os.Build;
diff --git a/ui/android/ui_android.gyp b/ui/android/ui_android.gyp
new file mode 100644
index 0000000..b9e3d69
--- /dev/null
+++ b/ui/android/ui_android.gyp
@@ -0,0 +1,39 @@
+# Copyright 2013 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+  'variables': {
+    'chromium_code': 1,
+  },
+  'targets': [
+    {
+      'target_name': 'window_open_disposition_java',
+      'type': 'none',
+      'sources': [
+        'java/WindowOpenDisposition.template',
+      ],
+      'variables': {
+        'package_name': 'org/chromium/ui',
+        'template_deps': ['../base/window_open_disposition_list.h'],
+      },
+      'includes': [ '../../build/android/java_cpp_template.gypi' ],
+    },
+    {
+      'target_name': 'ui_java',
+      'type': 'none',
+      'variables': {
+        'java_in_dir': '../../ui/android/java',
+        'has_java_resources': 1,
+        'R_package': 'org.chromium.ui',
+        'R_package_relpath': 'org/chromium/ui',
+        'java_strings_grd': 'android_ui_strings.grd',
+      },
+      'dependencies': [
+        '../../base/base.gyp:base_java',
+        'window_open_disposition_java',
+      ],
+      'includes': [ '../../build/java.gypi' ],
+    },
+  ],
+}
diff --git a/ui/base/android/ui_jni_registrar.cc b/ui/base/android/ui_base_jni_registrar.cc
index 6ab2174..34b00c7 100644
--- a/ui/base/android/ui_jni_registrar.cc
+++ b/ui/base/android/ui_base_jni_registrar.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/base/android/ui_jni_registrar.h"
+#include "ui/base/android/ui_base_jni_registrar.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_registrar.h"
@@ -10,17 +10,15 @@
 #include "ui/base/android/window_android.h"
 #include "ui/base/clipboard/clipboard_android_initialization.h"
 #include "ui/base/l10n/l10n_util_android.h"
-#include "ui/gfx/android/device_display_info.h"
-#include "ui/gfx/android/java_bitmap.h"
 
 namespace ui {
 namespace android {
 
 static base::android::RegistrationMethod kUiRegisteredMethods[] = {
-  { "Clipboard", ui::RegisterClipboardAndroid },
+  { "Clipboard", RegisterClipboardAndroid },
   { "LocalizationUtils", l10n_util::RegisterLocalizationUtil },
-  { "ViewAndroid", ui::ViewAndroid::RegisterViewAndroid },
-  { "WindowAndroid", ui::WindowAndroid::RegisterWindowAndroid },
+  { "ViewAndroid", ViewAndroid::RegisterViewAndroid },
+  { "WindowAndroid", WindowAndroid::RegisterWindowAndroid },
 };
 
 bool RegisterJni(JNIEnv* env) {
diff --git a/ui/base/android/ui_jni_registrar.h b/ui/base/android/ui_base_jni_registrar.h
index 7e6da21..928e515 100644
--- a/ui/base/android/ui_jni_registrar.h
+++ b/ui/base/android/ui_base_jni_registrar.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_BASE_ANDROID_UI_JNI_REGISTRAR_H_
-#define UI_BASE_ANDROID_UI_JNI_REGISTRAR_H_
+#ifndef UI_BASE_ANDROID_UI_BASE_JNI_REGISTRAR_H_
+#define UI_BASE_ANDROID_UI_BASE_JNI_REGISTRAR_H_
 
 #include <jni.h>
 
@@ -18,4 +18,4 @@ UI_EXPORT bool RegisterJni(JNIEnv* env);
 }  // namespace android
 }  // namespace ui
 
-#endif  // UI_BASE_ANDROID_UI_JNI_REGISTRAR_H_
+#endif  // UI_BASE_ANDROID_UI_BASE_JNI_REGISTRAR_H_
diff --git a/ui/gl/gl.gyp b/ui/gl/gl.gyp
index 1cb76b3..4aa5f70 100644
--- a/ui/gl/gl.gyp
+++ b/ui/gl/gl.gyp
@@ -346,8 +346,8 @@
             'surface_jni_headers',
           ],
           'sources': [
-            '../android/java/src/org/chromium/ui/gfx/SurfaceTexturePlatformWrapper.java',
-            '../android/java/src/org/chromium/ui/gfx/SurfaceTextureListener.java',
+            '../android/java/src/org/chromium/ui/gl/SurfaceTexturePlatformWrapper.java',
+            '../android/java/src/org/chromium/ui/gl/SurfaceTextureListener.java',
           ],
           'variables': {
             'jni_gen_package': 'ui/gl',
diff --git a/ui/shell_dialogs/shell_dialogs.gyp b/ui/shell_dialogs/shell_dialogs.gyp
index 5f52d0c..2df9435 100644
--- a/ui/shell_dialogs/shell_dialogs.gyp
+++ b/ui/shell_dialogs/shell_dialogs.gyp
@@ -64,7 +64,7 @@
         ['OS=="android"',
           {
             'dependencies': [
-              '../ui.gyp:ui_jni_headers',
+              '../ui.gyp:ui_base_jni_headers',
             ],
             'include_dirs': [
               '<(SHARED_INTERMEDIATE_DIR)/ui',
@@ -79,7 +79,7 @@
         ['OS=="android" and android_webview_build==0',
           {
             'dependencies': [
-              '../ui.gyp:ui_java',
+              '../android/ui_android.gyp:ui_java',
             ],
           }
         ],
diff --git a/ui/test/test_suite.cc b/ui/test/test_suite.cc
index a61fd74..1ba954d 100644
--- a/ui/test/test_suite.cc
+++ b/ui/test/test_suite.cc
@@ -14,7 +14,7 @@
 
 #if defined(OS_ANDROID)
 #include "base/android/jni_android.h"
-#include "ui/base/android/ui_jni_registrar.h"
+#include "ui/base/android/ui_base_jni_registrar.h"
 #include "ui/gfx/android/gfx_jni_registrar.h"
 #endif
 
diff --git a/ui/ui.gyp b/ui/ui.gyp
index c5206d8..bda53fa 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -54,8 +54,8 @@
         'base/accessibility/accessible_text_utils.h',
         'base/accessibility/accessible_view_state.cc',
         'base/accessibility/accessible_view_state.h',
-        'base/android/ui_jni_registrar.cc',
-        'base/android/ui_jni_registrar.h',
+        'base/android/ui_base_jni_registrar.cc',
+        'base/android/ui_base_jni_registrar.h',
         'base/android/view_android.cc',
         'base/android/view_android.h',
         'base/android/window_android.cc',
@@ -561,7 +561,7 @@
             'base/ui_base_types.cc',
           ],
           'dependencies': [
-            'ui_jni_headers',
+            'ui_base_jni_headers',
           ],
           'include_dirs': [
             '<(SHARED_INTERMEDIATE_DIR)/ui',
@@ -574,7 +574,7 @@
         }],
         ['OS=="android" and android_webview_build==0', {
           'dependencies': [
-            'ui_java',
+            'android/ui_android.gyp:ui_java',
           ],
         }],
         ['OS=="android" or OS=="ios"', {
@@ -621,7 +621,7 @@
     ['OS=="android"' , {
        'targets': [
          {
-           'target_name': 'ui_jni_headers',
+           'target_name': 'ui_base_jni_headers',
            'type': 'none',
            'direct_dependent_settings': {
              'include_dirs': [
@@ -629,11 +629,11 @@
              ],
            },
            'sources': [
-             'android/java/src/org/chromium/ui/Clipboard.java',
-             'android/java/src/org/chromium/ui/LocalizationUtils.java',
-             'android/java/src/org/chromium/ui/SelectFileDialog.java',
-             'android/java/src/org/chromium/ui/ViewAndroid.java',
-             'android/java/src/org/chromium/ui/WindowAndroid.java',
+             'android/java/src/org/chromium/ui/base/Clipboard.java',
+             'android/java/src/org/chromium/ui/base/LocalizationUtils.java',
+             'android/java/src/org/chromium/ui/base/SelectFileDialog.java',
+             'android/java/src/org/chromium/ui/base/ViewAndroid.java',
+             'android/java/src/org/chromium/ui/base/WindowAndroid.java',
            ],
            'variables': {
              'jni_gen_package': 'ui',
@@ -641,34 +641,6 @@
            },
            'includes': [ '../build/jni_generator.gypi' ],
          },
-         {
-           'target_name': 'ui_java',
-           'type': 'none',
-           'variables': {
-             'java_in_dir': '../ui/android/java',
-             'has_java_resources': 1,
-             'R_package': 'org.chromium.ui',
-             'R_package_relpath': 'org/chromium/ui',
-             'java_strings_grd': 'android_ui_strings.grd',
-           },
-           'dependencies': [
-             '../base/base.gyp:base_java',
-             'window_open_disposition_java',
-           ],
-           'includes': [ '../build/java.gypi' ],
-         },
-         {
-           'target_name': 'window_open_disposition_java',
-           'type': 'none',
-           'sources': [
-             'android/java/WindowOpenDisposition.template',
-           ],
-           'variables': {
-             'package_name': 'org/chromium/ui',
-             'template_deps': ['base/window_open_disposition_list.h'],
-           },
-           'includes': [ '../build/android/java_cpp_template.gypi' ],
-         },
        ],
     }],
     ['OS=="mac"', {