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

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

Issue 1127983002: Add connectivity check for Android feedback. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move test to new test package, and merge with upstream (conflict in chrome_jni_registrar.cc) Created 5 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
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/trace_event/trace_event.h" 9 #include "base/trace_event/trace_event.h"
10 #include "chrome/browser/android/accessibility/font_size_prefs_android.h" 10 #include "chrome/browser/android/accessibility/font_size_prefs_android.h"
11 #include "chrome/browser/android/accessibility_util.h" 11 #include "chrome/browser/android/accessibility_util.h"
12 #include "chrome/browser/android/appmenu/app_menu_drag_helper.h" 12 #include "chrome/browser/android/appmenu/app_menu_drag_helper.h"
13 #include "chrome/browser/android/banners/app_banner_infobar_delegate.h" 13 #include "chrome/browser/android/banners/app_banner_infobar_delegate.h"
14 #include "chrome/browser/android/banners/app_banner_manager_android.h" 14 #include "chrome/browser/android/banners/app_banner_manager_android.h"
15 #include "chrome/browser/android/bookmarks/bookmarks_bridge.h" 15 #include "chrome/browser/android/bookmarks/bookmarks_bridge.h"
16 #include "chrome/browser/android/bookmarks/partner_bookmarks_reader.h" 16 #include "chrome/browser/android/bookmarks/partner_bookmarks_reader.h"
17 #include "chrome/browser/android/chrome_web_contents_delegate_android.h" 17 #include "chrome/browser/android/chrome_web_contents_delegate_android.h"
18 #include "chrome/browser/android/chromium_application.h" 18 #include "chrome/browser/android/chromium_application.h"
19 #include "chrome/browser/android/compositor/layer_title_cache.h" 19 #include "chrome/browser/android/compositor/layer_title_cache.h"
20 #include "chrome/browser/android/compositor/scene_layer/scene_layer.h" 20 #include "chrome/browser/android/compositor/scene_layer/scene_layer.h"
21 #include "chrome/browser/android/compositor/scene_layer/static_tab_scene_layer.h " 21 #include "chrome/browser/android/compositor/scene_layer/static_tab_scene_layer.h "
22 #include "chrome/browser/android/compositor/tab_content_manager.h" 22 #include "chrome/browser/android/compositor/tab_content_manager.h"
23 #include "chrome/browser/android/content_view_util.h" 23 #include "chrome/browser/android/content_view_util.h"
24 #include "chrome/browser/android/cookies/cookies_fetcher.h" 24 #include "chrome/browser/android/cookies/cookies_fetcher.h"
25 #include "chrome/browser/android/dev_tools_server.h" 25 #include "chrome/browser/android/dev_tools_server.h"
26 #include "chrome/browser/android/dom_distiller/external_feedback_reporter_androi d.h" 26 #include "chrome/browser/android/dom_distiller/external_feedback_reporter_androi d.h"
27 #include "chrome/browser/android/download/chrome_download_delegate.h" 27 #include "chrome/browser/android/download/chrome_download_delegate.h"
28 #include "chrome/browser/android/favicon_helper.h" 28 #include "chrome/browser/android/favicon_helper.h"
29 #include "chrome/browser/android/feature_utilities.h" 29 #include "chrome/browser/android/feature_utilities.h"
30 #include "chrome/browser/android/feedback/connectivity_checker.h"
30 #include "chrome/browser/android/find_in_page/find_in_page_bridge.h" 31 #include "chrome/browser/android/find_in_page/find_in_page_bridge.h"
31 #include "chrome/browser/android/foreign_session_helper.h" 32 #include "chrome/browser/android/foreign_session_helper.h"
32 #include "chrome/browser/android/fullscreen/fullscreen_infobar_delegate.h" 33 #include "chrome/browser/android/fullscreen/fullscreen_infobar_delegate.h"
33 #include "chrome/browser/android/intent_helper.h" 34 #include "chrome/browser/android/intent_helper.h"
34 #include "chrome/browser/android/java_exception_reporter.h" 35 #include "chrome/browser/android/java_exception_reporter.h"
35 #include "chrome/browser/android/large_icon_bridge.h" 36 #include "chrome/browser/android/large_icon_bridge.h"
36 #include "chrome/browser/android/location_settings_impl.h" 37 #include "chrome/browser/android/location_settings_impl.h"
37 #include "chrome/browser/android/logo_bridge.h" 38 #include "chrome/browser/android/logo_bridge.h"
38 #include "chrome/browser/android/metrics/launch_metrics.h" 39 #include "chrome/browser/android/metrics/launch_metrics.h"
39 #include "chrome/browser/android/metrics/uma_session_stats.h" 40 #include "chrome/browser/android/metrics/uma_session_stats.h"
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 ChromeBrowserProvider::RegisterChromeBrowserProvider}, 175 ChromeBrowserProvider::RegisterChromeBrowserProvider},
175 {"ChromeHttpAuthHandler", 176 {"ChromeHttpAuthHandler",
176 ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler}, 177 ChromeHttpAuthHandler::RegisterChromeHttpAuthHandler},
177 {"ChromeWebContentsDelegateAndroid", 178 {"ChromeWebContentsDelegateAndroid",
178 RegisterChromeWebContentsDelegateAndroid}, 179 RegisterChromeWebContentsDelegateAndroid},
179 {"ChromiumApplication", ChromiumApplication::RegisterBindings}, 180 {"ChromiumApplication", ChromiumApplication::RegisterBindings},
180 {"ConfirmInfoBarDelegate", RegisterConfirmInfoBarDelegate}, 181 {"ConfirmInfoBarDelegate", RegisterConfirmInfoBarDelegate},
181 {"ConnectionInfoPopupAndroid", 182 {"ConnectionInfoPopupAndroid",
182 ConnectionInfoPopupAndroid::RegisterConnectionInfoPopupAndroid}, 183 ConnectionInfoPopupAndroid::RegisterConnectionInfoPopupAndroid},
183 {"ConnectionSecurityHelper", RegisterConnectionSecurityHelperAndroid}, 184 {"ConnectionSecurityHelper", RegisterConnectionSecurityHelperAndroid},
185 {"ConnectivityChecker", RegisterConnectivityChecker},
184 {"ContentViewUtil", RegisterContentViewUtil}, 186 {"ContentViewUtil", RegisterContentViewUtil},
185 {"ContextMenuHelper", RegisterContextMenuHelper}, 187 {"ContextMenuHelper", RegisterContextMenuHelper},
186 {"CookiesFetcher", RegisterCookiesFetcher}, 188 {"CookiesFetcher", RegisterCookiesFetcher},
187 {"Credential", RegisterCredential}, 189 {"Credential", RegisterCredential},
188 {"CreditCardScanner", autofill::CreditCardScannerViewAndroid::Register}, 190 {"CreditCardScanner", autofill::CreditCardScannerViewAndroid::Register},
189 {"DataReductionProxyInfoBarDelegate", DataReductionProxyInfoBar::Register}, 191 {"DataReductionProxyInfoBarDelegate", DataReductionProxyInfoBar::Register},
190 {"DataReductionProxySettings", DataReductionProxySettingsAndroid::Register}, 192 {"DataReductionProxySettings", DataReductionProxySettingsAndroid::Register},
191 {"DevToolsServer", RegisterDevToolsServer}, 193 {"DevToolsServer", RegisterDevToolsServer},
192 {"DomDistillerServiceFactory", 194 {"DomDistillerServiceFactory",
193 dom_distiller::android::DomDistillerServiceFactoryAndroid::Register}, 195 dom_distiller::android::DomDistillerServiceFactoryAndroid::Register},
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
283 }; 285 };
284 286
285 bool RegisterBrowserJNI(JNIEnv* env) { 287 bool RegisterBrowserJNI(JNIEnv* env) {
286 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); 288 TRACE_EVENT0("startup", "chrome_android::RegisterJni");
287 return RegisterNativeMethods(env, kChromeRegisteredMethods, 289 return RegisterNativeMethods(env, kChromeRegisteredMethods,
288 arraysize(kChromeRegisteredMethods)); 290 arraysize(kChromeRegisteredMethods));
289 } 291 }
290 292
291 } // namespace android 293 } // namespace android
292 } // namespace chrome 294 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698