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

Side by Side Diff: components/web_contents_delegate_android/component_jni_registrar.cc

Issue 11823046: Move content/components/web_contents_delegate_android to components/web_contents_delegate_android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase (win7_aura so slow!!) Created 7 years, 11 months 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 | Annotate | Revision Log
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/components/web_contents_delegate_android/component_jni_registr ar.h" 5 #include "components/web_contents_delegate_android/component_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/components/web_contents_delegate_android/web_contents_delegate _android.h" 9 #include "components/web_contents_delegate_android/color_chooser_android.h"
10 #include "components/web_contents_delegate_android/web_contents_delegate_android .h"
10 11
11 namespace content { 12 namespace components {
12 13
13 static base::android::RegistrationMethod kComponentRegisteredMethods[] = { 14 static base::android::RegistrationMethod kComponentRegisteredMethods[] = {
15 { "ColorChooserAndroid", RegisterColorChooserAndroid },
14 { "WebContentsDelegateAndroid", RegisterWebContentsDelegateAndroid }, 16 { "WebContentsDelegateAndroid", RegisterWebContentsDelegateAndroid },
15 }; 17 };
16 18
17 bool RegisterWebContentsDelegateAndroidJni(JNIEnv* env) { 19 bool RegisterWebContentsDelegateAndroidJni(JNIEnv* env) {
18 return RegisterNativeMethods(env, 20 return RegisterNativeMethods(env,
19 kComponentRegisteredMethods, arraysize(kComponentRegisteredMethods)); 21 kComponentRegisteredMethods, arraysize(kComponentRegisteredMethods));
20 } 22 }
21 23
22 } // namespace content 24 } // namespace components
23 25
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698