diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-08 21:37:02 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-08 21:37:02 +0000 |
| commit | 993951d6500d51ee010103c7f8727eaa900bd563 (patch) | |
| tree | 00a893a4304d5cd8fe0ba380613d99fa3f9667f9 /content/shell/android | |
| parent | 4e84e1530afa6d94d256fa97e9c21daf648c117b (diff) | |
| download | chromium_src-993951d6500d51ee010103c7f8727eaa900bd563.zip chromium_src-993951d6500d51ee010103c7f8727eaa900bd563.tar.gz chromium_src-993951d6500d51ee010103c7f8727eaa900bd563.tar.bz2 | |
[content shell] move app startup related code to app subdir
BUG=180021
TBR=marja@chromium.org
Review URL: https://codereview.chromium.org/15060007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199015 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell/android')
| -rw-r--r-- | content/shell/android/browsertests_apk/content_browser_tests_android.cc | 2 | ||||
| -rw-r--r-- | content/shell/android/shell_library_loader.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/content/shell/android/browsertests_apk/content_browser_tests_android.cc b/content/shell/android/browsertests_apk/content_browser_tests_android.cc index 3425480..99c6171 100644 --- a/content/shell/android/browsertests_apk/content_browser_tests_android.cc +++ b/content/shell/android/browsertests_apk/content_browser_tests_android.cc @@ -24,7 +24,7 @@ #include "content/public/common/content_switches.h" #include "content/public/test/test_launcher.h" #include "content/shell/android/shell_jni_registrar.h" -#include "content/shell/shell_main_delegate.h" +#include "content/shell/app/shell_main_delegate.h" #include "content/test/browser_test_message_pump_android.h" #include "jni/ContentBrowserTestsActivity_jni.h" #include "testing/android/native_test_util.h" diff --git a/content/shell/android/shell_library_loader.cc b/content/shell/android/shell_library_loader.cc index f320387f..599e421 100644 --- a/content/shell/android/shell_library_loader.cc +++ b/content/shell/android/shell_library_loader.cc @@ -11,7 +11,7 @@ #include "content/public/app/content_main.h" #include "content/public/browser/android/compositor.h" #include "content/shell/android/shell_jni_registrar.h" -#include "content/shell/shell_main_delegate.h" +#include "content/shell/app/shell_main_delegate.h" // This is called by the VM when the shared library is first loaded. JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { |