Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(90)

Side by Side Diff: content/shell/android/shell_jni_registrar.cc

Issue 1469803006: NOT FOR REVIEW: Aura Android: Content Shell compiles (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@auraclank_upstream_wthandroid
Patch Set: Temp Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/shell/android/shell_jni_registrar.h" 5 #include "content/shell/android/shell_jni_registrar.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_registrar.h" 8 #include "base/android/jni_registrar.h"
9 #include "content/shell/android/shell_manager.h" 9 #include "content/shell/android/shell_manager.h"
10 #include "content/shell/browser/shell.h" 10 #include "content/shell/browser/shell.h"
11 #include "content/shell/browser/shell_mojo_test_utils_android.h" 11 #include "content/shell/browser/shell_mojo_test_utils_android.h"
12 #include "ui/platform_window/android/platform_window_jni_registrar.h"
12 13
13 namespace { 14 namespace {
14 15
15 static base::android::RegistrationMethod kShellRegistrationMethods[] = { 16 static base::android::RegistrationMethod kShellRegistrationMethods[] = {
16 {"Shell", content::Shell::Register}, 17 {"Shell", content::Shell::Register},
18 #if defined(USE_AURA)
19 {"platform_window", ui::RegisterPlatformWindowJni},
20 #else
21 {"ShellMojoTestUtils", content::RegisterShellMojoTestUtils},
17 {"ShellManager", content::RegisterShellManager}, 22 {"ShellManager", content::RegisterShellManager},
18 {"ShellMojoTestUtils", content::RegisterShellMojoTestUtils}, 23 #endif
19 }; 24 };
20 25
21 } // namespace 26 } // namespace
22 27
23 namespace content { 28 namespace content {
24 namespace android { 29 namespace android {
25 30
26 bool RegisterShellJni(JNIEnv* env) { 31 bool RegisterShellJni(JNIEnv* env) {
32 LOG(ERROR) << " ~~~ RegisterShellJni";
27 return RegisterNativeMethods(env, kShellRegistrationMethods, 33 return RegisterNativeMethods(env, kShellRegistrationMethods,
28 arraysize(kShellRegistrationMethods)); 34 arraysize(kShellRegistrationMethods));
29 } 35 }
30 36
31 } // namespace android 37 } // namespace android
32 } // namespace content 38 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698