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

Side by Side Diff: chrome/browser/android/chrome_jni_registrar.cc

Issue 79573003: Upstreaming AppMenu. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Actually add tvdpi Created 7 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 | Annotate | Revision Log
« no previous file with comments | « chrome/android/testshell/res/menu/main_menu.xml ('k') | chrome/browser/android/uma_bridge.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "chrome/browser/android/chrome_jni_registrar.h" 5 #include "chrome/browser/android/chrome_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 "base/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "chrome/browser/android/bookmarks/bookmarks_bridge.h" 10 #include "chrome/browser/android/bookmarks/bookmarks_bridge.h"
11 #include "chrome/browser/android/chrome_web_contents_delegate_android.h" 11 #include "chrome/browser/android/chrome_web_contents_delegate_android.h"
12 #include "chrome/browser/android/chromium_application.h" 12 #include "chrome/browser/android/chromium_application.h"
13 #include "chrome/browser/android/content_view_util.h" 13 #include "chrome/browser/android/content_view_util.h"
14 #include "chrome/browser/android/dev_tools_server.h" 14 #include "chrome/browser/android/dev_tools_server.h"
15 #include "chrome/browser/android/favicon_helper.h" 15 #include "chrome/browser/android/favicon_helper.h"
16 #include "chrome/browser/android/field_trial_helper.h" 16 #include "chrome/browser/android/field_trial_helper.h"
17 #include "chrome/browser/android/foreign_session_helper.h" 17 #include "chrome/browser/android/foreign_session_helper.h"
18 #include "chrome/browser/android/intent_helper.h" 18 #include "chrome/browser/android/intent_helper.h"
19 #include "chrome/browser/android/most_visited_sites.h" 19 #include "chrome/browser/android/most_visited_sites.h"
20 #include "chrome/browser/android/new_tab_page_prefs.h" 20 #include "chrome/browser/android/new_tab_page_prefs.h"
21 #include "chrome/browser/android/omnibox/omnibox_prerender.h" 21 #include "chrome/browser/android/omnibox/omnibox_prerender.h"
22 #include "chrome/browser/android/password_ui_view_android.h" 22 #include "chrome/browser/android/password_ui_view_android.h"
23 #include "chrome/browser/android/provider/chrome_browser_provider.h" 23 #include "chrome/browser/android/provider/chrome_browser_provider.h"
24 #include "chrome/browser/android/recently_closed_tabs_bridge.h" 24 #include "chrome/browser/android/recently_closed_tabs_bridge.h"
25 #include "chrome/browser/android/shortcut_helper.h" 25 #include "chrome/browser/android/shortcut_helper.h"
26 #include "chrome/browser/android/signin/signin_manager_android.h" 26 #include "chrome/browser/android/signin/signin_manager_android.h"
27 #include "chrome/browser/android/tab_android.h" 27 #include "chrome/browser/android/tab_android.h"
28 #include "chrome/browser/android/uma_bridge.h"
28 #include "chrome/browser/android/uma_utils.h" 29 #include "chrome/browser/android/uma_utils.h"
29 #include "chrome/browser/android/url_utilities.h" 30 #include "chrome/browser/android/url_utilities.h"
30 #include "chrome/browser/autofill/android/personal_data_manager_android.h" 31 #include "chrome/browser/autofill/android/personal_data_manager_android.h"
31 #include "chrome/browser/history/android/sqlite_cursor.h" 32 #include "chrome/browser/history/android/sqlite_cursor.h"
32 #include "chrome/browser/invalidation/invalidation_controller_android.h" 33 #include "chrome/browser/invalidation/invalidation_controller_android.h"
33 #include "chrome/browser/lifetime/application_lifetime_android.h" 34 #include "chrome/browser/lifetime/application_lifetime_android.h"
34 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.h" 35 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.h"
35 #include "chrome/browser/prerender/external_prerender_handler_android.h" 36 #include "chrome/browser/prerender/external_prerender_handler_android.h"
36 #include "chrome/browser/profiles/profile_android.h" 37 #include "chrome/browser/profiles/profile_android.h"
37 #include "chrome/browser/search_engines/template_url_service_android.h" 38 #include "chrome/browser/search_engines/template_url_service_android.h"
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 { "ProfileSyncService", ProfileSyncServiceAndroid::Register }, 126 { "ProfileSyncService", ProfileSyncServiceAndroid::Register },
126 { "RecentlyClosedBridge", RecentlyClosedTabsBridge::Register }, 127 { "RecentlyClosedBridge", RecentlyClosedTabsBridge::Register },
127 { "SigninManager", SigninManagerAndroid::Register }, 128 { "SigninManager", SigninManagerAndroid::Register },
128 { "SqliteCursor", SQLiteCursor::RegisterSqliteCursor }, 129 { "SqliteCursor", SQLiteCursor::RegisterSqliteCursor },
129 { "SSLClientCertificateRequest", RegisterSSLClientCertificateRequestAndroid }, 130 { "SSLClientCertificateRequest", RegisterSSLClientCertificateRequestAndroid },
130 { "StartupMetricUtils", RegisterStartupMetricUtils }, 131 { "StartupMetricUtils", RegisterStartupMetricUtils },
131 { "TabAndroid", TabAndroid::RegisterTabAndroid }, 132 { "TabAndroid", TabAndroid::RegisterTabAndroid },
132 { "TemplateUrlServiceAndroid", TemplateUrlServiceAndroid::Register }, 133 { "TemplateUrlServiceAndroid", TemplateUrlServiceAndroid::Register },
133 { "TranslateInfoBarDelegate", RegisterTranslateInfoBarDelegate }, 134 { "TranslateInfoBarDelegate", RegisterTranslateInfoBarDelegate },
134 { "TtsPlatformImpl", TtsPlatformImplAndroid::Register }, 135 { "TtsPlatformImpl", TtsPlatformImplAndroid::Register },
136 { "UmaBridge", RegisterUmaBridge },
135 { "UrlUtilities", RegisterUrlUtilities }, 137 { "UrlUtilities", RegisterUrlUtilities },
136 { "ValidationMessageBubbleAndroid", 138 { "ValidationMessageBubbleAndroid",
137 ValidationMessageBubbleAndroid::Register }, 139 ValidationMessageBubbleAndroid::Register },
138 { "WebsiteSettingsPopupAndroid", 140 { "WebsiteSettingsPopupAndroid",
139 WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid }, 141 WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid },
140 #if defined(ENABLE_PRINTING) && !defined(ENABLE_FULL_PRINTING) 142 #if defined(ENABLE_PRINTING) && !defined(ENABLE_FULL_PRINTING)
141 { "PrintingContext", 143 { "PrintingContext",
142 printing::PrintingContextAndroid::RegisterPrintingContext}, 144 printing::PrintingContextAndroid::RegisterPrintingContext},
143 #endif 145 #endif
144 }; 146 };
145 147
146 bool RegisterJni(JNIEnv* env) { 148 bool RegisterJni(JNIEnv* env) {
147 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); 149 TRACE_EVENT0("startup", "chrome_android::RegisterJni");
148 return RegisterNativeMethods(env, kChromeRegisteredMethods, 150 return RegisterNativeMethods(env, kChromeRegisteredMethods,
149 arraysize(kChromeRegisteredMethods)); 151 arraysize(kChromeRegisteredMethods));
150 } 152 }
151 153
152 } // namespace android 154 } // namespace android
153 } // namespace chrome 155 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/android/testshell/res/menu/main_menu.xml ('k') | chrome/browser/android/uma_bridge.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698