diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-31 07:36:00 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-31 07:36:00 +0000 |
| commit | f7c4c2733bdcd78a67748fb8444c58df9bad7354 (patch) | |
| tree | cf2af1aa2b9d151f70c381b12272f029f22df618 /content | |
| parent | 8e01c06dc909bf509e3cddaa6d1daa5712834d5c (diff) | |
| download | chromium_src-f7c4c2733bdcd78a67748fb8444c58df9bad7354.zip chromium_src-f7c4c2733bdcd78a67748fb8444c58df9bad7354.tar.gz chromium_src-f7c4c2733bdcd78a67748fb8444c58df9bad7354.tar.bz2 | |
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
Diffstat (limited to 'content')
| -rw-r--r-- | content/app/android/library_loader_hooks.cc | 2 | ||||
| -rw-r--r-- | content/browser/android/content_view_core_impl.cc | 4 | ||||
| -rw-r--r-- | content/browser/power_save_blocker_android.cc | 2 | ||||
| -rw-r--r-- | content/public/test/content_test_suite_base.cc | 2 |
4 files changed, 5 insertions, 5 deletions
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" |