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

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

Issue 266073003: Add support for distilling current WebContents (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed all comments and added tests. Also removed the timeout for the view request delegate. Created 6 years, 7 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 "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/accessibility_util.h" 10 #include "chrome/browser/android/accessibility_util.h"
(...skipping 20 matching lines...) Expand all
31 #include "chrome/browser/android/recently_closed_tabs_bridge.h" 31 #include "chrome/browser/android/recently_closed_tabs_bridge.h"
32 #include "chrome/browser/android/shortcut_helper.h" 32 #include "chrome/browser/android/shortcut_helper.h"
33 #include "chrome/browser/android/signin/account_management_screen_helper.h" 33 #include "chrome/browser/android/signin/account_management_screen_helper.h"
34 #include "chrome/browser/android/signin/signin_manager_android.h" 34 #include "chrome/browser/android/signin/signin_manager_android.h"
35 #include "chrome/browser/android/tab_android.h" 35 #include "chrome/browser/android/tab_android.h"
36 #include "chrome/browser/android/uma_bridge.h" 36 #include "chrome/browser/android/uma_bridge.h"
37 #include "chrome/browser/android/uma_utils.h" 37 #include "chrome/browser/android/uma_utils.h"
38 #include "chrome/browser/android/url_utilities.h" 38 #include "chrome/browser/android/url_utilities.h"
39 #include "chrome/browser/android/voice_search_tab_helper.h" 39 #include "chrome/browser/android/voice_search_tab_helper.h"
40 #include "chrome/browser/autofill/android/personal_data_manager_android.h" 40 #include "chrome/browser/autofill/android/personal_data_manager_android.h"
41 #include "chrome/browser/dom_distiller/tab_utils_android.h"
41 #include "chrome/browser/history/android/sqlite_cursor.h" 42 #include "chrome/browser/history/android/sqlite_cursor.h"
42 #include "chrome/browser/invalidation/invalidation_controller_android.h" 43 #include "chrome/browser/invalidation/invalidation_controller_android.h"
43 #include "chrome/browser/lifetime/application_lifetime_android.h" 44 #include "chrome/browser/lifetime/application_lifetime_android.h"
44 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.h" 45 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.h"
45 #include "chrome/browser/prerender/external_prerender_handler_android.h" 46 #include "chrome/browser/prerender/external_prerender_handler_android.h"
46 #include "chrome/browser/profiles/profile_android.h" 47 #include "chrome/browser/profiles/profile_android.h"
47 #include "chrome/browser/search_engines/template_url_service_android.h" 48 #include "chrome/browser/search_engines/template_url_service_android.h"
48 #include "chrome/browser/signin/android_profile_oauth2_token_service.h" 49 #include "chrome/browser/signin/android_profile_oauth2_token_service.h"
49 #include "chrome/browser/speech/tts_android.h" 50 #include "chrome/browser/speech/tts_android.h"
50 #include "chrome/browser/sync/profile_sync_service_android.h" 51 #include "chrome/browser/sync/profile_sync_service_android.h"
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler }, 117 ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler },
117 { "ChromeWebContentsDelegateAndroid", 118 { "ChromeWebContentsDelegateAndroid",
118 RegisterChromeWebContentsDelegateAndroid }, 119 RegisterChromeWebContentsDelegateAndroid },
119 { "ChromiumApplication", 120 { "ChromiumApplication",
120 ChromiumApplication::RegisterBindings }, 121 ChromiumApplication::RegisterBindings },
121 { "ConfirmInfoBarDelegate", RegisterConfirmInfoBarDelegate }, 122 { "ConfirmInfoBarDelegate", RegisterConfirmInfoBarDelegate },
122 { "ContentViewUtil", RegisterContentViewUtil }, 123 { "ContentViewUtil", RegisterContentViewUtil },
123 { "ContextMenuHelper", RegisterContextMenuHelper }, 124 { "ContextMenuHelper", RegisterContextMenuHelper },
124 { "DataReductionProxySettings", DataReductionProxySettingsAndroid::Register }, 125 { "DataReductionProxySettings", DataReductionProxySettingsAndroid::Register },
125 { "DevToolsServer", RegisterDevToolsServer }, 126 { "DevToolsServer", RegisterDevToolsServer },
127 { "DomDistillerTabUtils",
128 dom_distiller::tab_utils::android::RegisterTabUtils },
126 { "ExternalPrerenderRequestHandler", 129 { "ExternalPrerenderRequestHandler",
127 prerender::ExternalPrerenderHandlerAndroid:: 130 prerender::ExternalPrerenderHandlerAndroid::
128 RegisterExternalPrerenderHandlerAndroid }, 131 RegisterExternalPrerenderHandlerAndroid },
129 { "FaviconHelper", FaviconHelper::RegisterFaviconHelper }, 132 { "FaviconHelper", FaviconHelper::RegisterFaviconHelper },
130 { "FeedbackReporter", dom_distiller::android::RegisterFeedbackReporter }, 133 { "FeedbackReporter", dom_distiller::android::RegisterFeedbackReporter },
131 { "FieldTrialHelper", RegisterFieldTrialHelper }, 134 { "FieldTrialHelper", RegisterFieldTrialHelper },
132 { "ForeignSessionHelper", 135 { "ForeignSessionHelper",
133 ForeignSessionHelper::RegisterForeignSessionHelper }, 136 ForeignSessionHelper::RegisterForeignSessionHelper },
134 { "InfoBarContainer", RegisterInfoBarContainer }, 137 { "InfoBarContainer", RegisterInfoBarContainer },
135 { "ShortcutHelper", ShortcutHelper::RegisterShortcutHelper }, 138 { "ShortcutHelper", ShortcutHelper::RegisterShortcutHelper },
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 }; 180 };
178 181
179 bool RegisterJni(JNIEnv* env) { 182 bool RegisterJni(JNIEnv* env) {
180 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); 183 TRACE_EVENT0("startup", "chrome_android::RegisterJni");
181 return RegisterNativeMethods(env, kChromeRegisteredMethods, 184 return RegisterNativeMethods(env, kChromeRegisteredMethods,
182 arraysize(kChromeRegisteredMethods)); 185 arraysize(kChromeRegisteredMethods));
183 } 186 }
184 187
185 } // namespace android 188 } // namespace android
186 } // namespace chrome 189 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698