ui: Move android C++ source files into base/android directory.

BUG=299841
TEST=None, no functional changes.
R=ben@chromium.org,bulach@chromium.org

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

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

24 files changed, 56 insertions, 56 deletions

diff --git a/chrome/android/testshell/testshell_tab.cc b/chrome/android/testshell/testshell_tab.cc
index b625479..b6ceb47 100644
--- a/chrome/android/testshell/testshell_tab.cc
+++ b/chrome/android/testshell/testshell_tab.cc
@@ -13,7 +13,7 @@
 #include "content/public/browser/android/content_view_core.h"
 #include "content/public/browser/web_contents.h"
 #include "jni/TestShellTab_jni.h"
-#include "ui/android/window_android.h"
+#include "ui/base/android/window_android.h"
 #include "url/gurl.h"
 
 using base::android::ConvertJavaStringToUTF8;
diff --git a/chrome/browser/platform_util_android.cc b/chrome/browser/platform_util_android.cc
index dded7bc..1476ffd 100644
--- a/chrome/browser/platform_util_android.cc
+++ b/chrome/browser/platform_util_android.cc
@@ -4,7 +4,7 @@
 
 #include "base/logging.h"
 #include "chrome/browser/platform_util.h"
-#include "ui/android/view_android.h"
+#include "ui/base/android/view_android.h"
 
 namespace platform_util {
 
diff --git a/chrome/browser/ui/android/autofill/autofill_dialog_controller_android.cc b/chrome/browser/ui/android/autofill/autofill_dialog_controller_android.cc
index 9db3e43..bfacb8a 100644
--- a/chrome/browser/ui/android/autofill/autofill_dialog_controller_android.cc
+++ b/chrome/browser/ui/android/autofill/autofill_dialog_controller_android.cc
@@ -37,7 +37,7 @@
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "jni/AutofillDialogControllerAndroid_jni.h"
-#include "ui/android/window_android.h"
+#include "ui/base/android/window_android.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/base/models/menu_model.h"
diff --git a/chrome/browser/ui/android/autofill/autofill_popup_view_android.cc b/chrome/browser/ui/android/autofill/autofill_popup_view_android.cc
index 755947b..12b8121 100644
--- a/chrome/browser/ui/android/autofill/autofill_popup_view_android.cc
+++ b/chrome/browser/ui/android/autofill/autofill_popup_view_android.cc
@@ -10,8 +10,8 @@
 #include "chrome/browser/ui/autofill/autofill_popup_controller.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "jni/AutofillPopupGlue_jni.h"
-#include "ui/android/view_android.h"
-#include "ui/android/window_android.h"
+#include "ui/base/android/view_android.h"
+#include "ui/base/android/window_android.h"
 #include "ui/gfx/rect.h"
 
 namespace autofill {
diff --git a/chrome/browser/ui/android/javascript_app_modal_dialog_android.cc b/chrome/browser/ui/android/javascript_app_modal_dialog_android.cc
index 5d6242c..021f823 100644
--- a/chrome/browser/ui/android/javascript_app_modal_dialog_android.cc
+++ b/chrome/browser/ui/android/javascript_app_modal_dialog_android.cc
@@ -15,7 +15,7 @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/javascript_message_type.h"
 #include "jni/JavascriptAppModalDialog_jni.h"
-#include "ui/android/window_android.h"
+#include "ui/base/android/window_android.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertUTF16ToJavaString;
diff --git a/chrome/browser/ui/android/window_android_helper.cc b/chrome/browser/ui/android/window_android_helper.cc
index 9a6c0b9..e708d40 100644
--- a/chrome/browser/ui/android/window_android_helper.cc
+++ b/chrome/browser/ui/android/window_android_helper.cc
@@ -5,7 +5,7 @@
 #include "chrome/browser/ui/android/window_android_helper.h"
 
 #include "content/public/browser/web_contents.h"
-#include "ui/android/window_android.h"
+#include "ui/base/android/window_android.h"
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(WindowAndroidHelper);
 
diff --git a/chrome/test/base/chrome_test_suite.cc b/chrome/test/base/chrome_test_suite.cc
index e010054..7183b5c 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/android/ui_jni_registrar.h"
+#include "ui/base/android/ui_jni_registrar.h"
 #include "ui/gfx/android/gfx_jni_registrar.h"
 #include "ui/gl/android/gl_jni_registrar.h"
 #endif
diff --git a/content/app/android/library_loader_hooks.cc b/content/app/android/library_loader_hooks.cc
index 074de12..5ef9461 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/android/ui_jni_registrar.h"
+#include "ui/base/android/ui_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/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc
index 1e296f1..8f09202 100644
--- a/content/browser/android/content_view_core_impl.cc
+++ b/content/browser/android/content_view_core_impl.cc
@@ -48,8 +48,8 @@
 #include "jni/ContentViewCore_jni.h"
 #include "third_party/WebKit/public/web/WebBindings.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
-#include "ui/android/view_android.h"
-#include "ui/android/window_android.h"
+#include "ui/base/android/view_android.h"
+#include "ui/base/android/window_android.h"
 #include "ui/gfx/android/java_bitmap.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/size_conversions.h"
diff --git a/content/browser/power_save_blocker_android.cc b/content/browser/power_save_blocker_android.cc
index 720fbb2..ad9b24c 100644
--- a/content/browser/power_save_blocker_android.cc
+++ b/content/browser/power_save_blocker_android.cc
@@ -11,7 +11,7 @@
 #include "content/public/browser/android/content_view_core.h"
 #include "content/public/browser/browser_thread.h"
 #include "jni/PowerSaveBlocker_jni.h"
-#include "ui/android/view_android.h"
+#include "ui/base/android/view_android.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ScopedJavaLocalRef;
diff --git a/content/public/test/content_test_suite_base.cc b/content/public/test/content_test_suite_base.cc
index 2fe64ef..0532079 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/android/ui_jni_registrar.h"
+#include "ui/base/android/ui_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/ui/android/DEPS b/ui/android/DEPS
deleted file mode 100644
index 5ad99de..0000000
--- a/ui/android/DEPS
+++ /dev/null
@@ -1,5 +0,0 @@
-include_rules = [
-  "+jni",
-  "+ui/base",
-  "+ui/gfx",
-]
diff --git a/ui/base/DEPS b/ui/base/DEPS
index cda1db3..99ec151 100644
--- a/ui/base/DEPS
+++ b/ui/base/DEPS
@@ -1,9 +1,10 @@
 include_rules = [
   "+grit/app_locale_settings.h",
   "+grit/ui_resources.h",
-  "+grit/ui_unscaled_resources.h",
   "+grit/ui_strings.h",
+  "+grit/ui_unscaled_resources.h",
   "+grit/webui_resources.h",
+  "+jni",
   "+net",
   "+skia/ext",
   "+third_party/skia",
diff --git a/ui/base/android/OWNERS b/ui/base/android/OWNERS
new file mode 100644
index 0000000..9535813
--- /dev/null
+++ b/ui/base/android/OWNERS
@@ -0,0 +1,4 @@
+bulach@chromium.org
+tedchoc@chromium.org
+yfriedman@chromium.org
+newt@chromium.org
diff --git a/ui/android/ui_jni_registrar.cc b/ui/base/android/ui_jni_registrar.cc
index 33aeeaf..6ab2174 100644
--- a/ui/android/ui_jni_registrar.cc
+++ b/ui/base/android/ui_jni_registrar.cc
@@ -1,13 +1,13 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
-#include "ui/android/ui_jni_registrar.h"
+#include "ui/base/android/ui_jni_registrar.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_registrar.h"
-#include "ui/android/view_android.h"
-#include "ui/android/window_android.h"
+#include "ui/base/android/view_android.h"
+#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"
diff --git a/ui/android/ui_jni_registrar.h b/ui/base/android/ui_jni_registrar.h
index f40ed40..7e6da21 100644
--- a/ui/android/ui_jni_registrar.h
+++ b/ui/base/android/ui_jni_registrar.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
-#ifndef UI_ANDROID_UI_JNI_REGISTRAR_H_
-#define UI_ANDROID_UI_JNI_REGISTRAR_H_
+#ifndef UI_BASE_ANDROID_UI_JNI_REGISTRAR_H_
+#define UI_BASE_ANDROID_UI_JNI_REGISTRAR_H_
 
 #include <jni.h>
 
@@ -18,4 +18,4 @@ UI_EXPORT bool RegisterJni(JNIEnv* env);
 }  // namespace android
 }  // namespace ui
 
-#endif  // UI_ANDROID_UI_JNI_REGISTRAR_H_
+#endif  // UI_BASE_ANDROID_UI_JNI_REGISTRAR_H_
diff --git a/ui/android/view_android.cc b/ui/base/android/view_android.cc
index adfd987..8ee832e 100644
--- a/ui/android/view_android.cc
+++ b/ui/base/android/view_android.cc
@@ -1,14 +1,14 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// 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.
 
-#include "ui/android/view_android.h"
+#include "ui/base/android/view_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_helper.h"
 #include "base/android/scoped_java_ref.h"
 #include "jni/ViewAndroid_jni.h"
-#include "ui/android/window_android.h"
+#include "ui/base/android/window_android.h"
 
 namespace ui {
 
diff --git a/ui/android/view_android.h b/ui/base/android/view_android.h
index c95608d..7bd334d 100644
--- a/ui/android/view_android.h
+++ b/ui/base/android/view_android.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// 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.
 
-#ifndef UI_ANDROID_VIEW_ANDROID_H_
-#define UI_ANDROID_VIEW_ANDROID_H_
+#ifndef UI_BASE_ANDROID_VIEW_ANDROID_H_
+#define UI_BASE_ANDROID_VIEW_ANDROID_H_
 
 #include <jni.h>
 #include "base/android/jni_helper.h"
@@ -38,4 +38,4 @@ class UI_EXPORT ViewAndroid {
 
 }  // namespace ui
 
-#endif  // UI_ANDROID_VIEW_ANDROID_H_
+#endif  // UI_BASE_ANDROID_VIEW_ANDROID_H_
diff --git a/ui/android/window_android.cc b/ui/base/android/window_android.cc
index 439268f..4b421f9 100644
--- a/ui/android/window_android.cc
+++ b/ui/base/android/window_android.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
-#include "ui/android/window_android.h"
+#include "ui/base/android/window_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
diff --git a/ui/android/window_android.h b/ui/base/android/window_android.h
index 14b1f09..6c16b45 100644
--- a/ui/android/window_android.h
+++ b/ui/base/android/window_android.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
-#ifndef UI_ANDROID_WINDOW_ANDROID_H_
-#define UI_ANDROID_WINDOW_ANDROID_H_
+#ifndef UI_BASE_ANDROID_WINDOW_ANDROID_H_
+#define UI_BASE_ANDROID_WINDOW_ANDROID_H_
 
 #include <jni.h>
 #include <vector>
@@ -45,4 +45,4 @@ class UI_EXPORT WindowAndroid {
 
 }  // namespace ui
 
-#endif  // UI_ANDROID_WINDOW_ANDROID_H_
+#endif  // UI_BASE_ANDROID_WINDOW_ANDROID_H_
diff --git a/ui/shell_dialogs/select_file_dialog_android.cc b/ui/shell_dialogs/select_file_dialog_android.cc
index e2c29d6..6babe5c 100644
--- a/ui/shell_dialogs/select_file_dialog_android.cc
+++ b/ui/shell_dialogs/select_file_dialog_android.cc
@@ -13,7 +13,7 @@
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "jni/SelectFileDialog_jni.h"
-#include "ui/android/window_android.h"
+#include "ui/base/android/window_android.h"
 
 namespace ui {
 
diff --git a/ui/snapshot/snapshot_android.cc b/ui/snapshot/snapshot_android.cc
index 14c43ee..f175a87 100644
--- a/ui/snapshot/snapshot_android.cc
+++ b/ui/snapshot/snapshot_android.cc
@@ -4,8 +4,8 @@
 
 #include "ui/snapshot/snapshot.h"
 
-#include "ui/android/view_android.h"
-#include "ui/android/window_android.h"
+#include "ui/base/android/view_android.h"
+#include "ui/base/android/window_android.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/screen.h"
diff --git a/ui/test/test_suite.cc b/ui/test/test_suite.cc
index fc7c6b0..a61fd74 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/android/ui_jni_registrar.h"
+#include "ui/base/android/ui_jni_registrar.h"
 #include "ui/gfx/android/gfx_jni_registrar.h"
 #endif
 
diff --git a/ui/ui.gyp b/ui/ui.gyp
index a38f859..18ebe56 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -42,14 +42,10 @@
         'gfx/gfx.gyp:gfx',
       ],
       'sources' : [
-        'android/ui_jni_registrar.cc',
-        'android/ui_jni_registrar.h',
-        'android/view_android.cc',
-        'android/view_android.h',
-        'android/window_android.cc',
-        'android/window_android.h',
         'base/accelerators/accelerator.cc',
         'base/accelerators/accelerator.h',
+        'base/accelerators/accelerator_manager.cc',
+        'base/accelerators/accelerator_manager.h',
         'base/accelerators/menu_label_accelerator_util_linux.cc',
         'base/accelerators/menu_label_accelerator_util_linux.h',
         'base/accelerators/platform_accelerator.h',
@@ -57,13 +53,17 @@
         'base/accelerators/platform_accelerator_cocoa.mm',
         'base/accelerators/platform_accelerator_gtk.cc',
         'base/accelerators/platform_accelerator_gtk.h',
-        'base/accelerators/accelerator_manager.cc',
-        'base/accelerators/accelerator_manager.h',
         'base/accessibility/accessibility_types.h',
         'base/accessibility/accessible_text_utils.cc',
         '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/view_android.cc',
+        'base/android/view_android.h',
+        'base/android/window_android.cc',
+        'base/android/window_android.h',
         'base/base_window.cc',
         'base/base_window.h',
         'base/clipboard/clipboard.cc',
@@ -134,10 +134,10 @@
         'base/cursor/cursor_loader_null.cc',
         'base/cursor/cursor_loader_null.h',
         'base/cursor/cursor_loader_win.cc',
-        'base/cursor/cursor_null.cc',
         'base/cursor/cursor_loader_win.h',
         'base/cursor/cursor_loader_x11.cc',
         'base/cursor/cursor_loader_x11.h',
+        'base/cursor/cursor_null.cc',
         'base/cursor/cursor_win.cc',
         'base/cursor/cursor_x11.cc',
         'base/cursor/cursors_aura.cc',
@@ -163,10 +163,10 @@
         'base/dragdrop/gtk_dnd_util.h',
         'base/dragdrop/os_exchange_data.cc',
         'base/dragdrop/os_exchange_data.h',
-        'base/dragdrop/os_exchange_data_provider_aurax11.cc',
-        'base/dragdrop/os_exchange_data_provider_aurax11.h',
         'base/dragdrop/os_exchange_data_provider_aura.cc',
         'base/dragdrop/os_exchange_data_provider_aura.h',
+        'base/dragdrop/os_exchange_data_provider_aurax11.cc',
+        'base/dragdrop/os_exchange_data_provider_aurax11.h',
         'base/dragdrop/os_exchange_data_provider_win.cc',
         'base/dragdrop/os_exchange_data_provider_win.h',
         'base/gtk/event_synthesis_gtk.cc',
@@ -196,8 +196,8 @@
         'base/l10n/l10n_font_util.h',
         'base/l10n/l10n_util.cc',
         'base/l10n/l10n_util.h',
-        'base/l10n/l10n_util_android.h',
         'base/l10n/l10n_util_android.cc',
+        'base/l10n/l10n_util_android.h',
         'base/l10n/l10n_util_collator.h',
         'base/l10n/l10n_util_mac.h',
         'base/l10n/l10n_util_mac.mm',