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

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

Issue 2014803002: Move DownloadControllerAndroid from content/ to chrome/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix failing tests/bugs Created 4 years, 6 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/macros.h" 9 #include "base/macros.h"
10 #include "base/trace_event/trace_event.h" 10 #include "base/trace_event/trace_event.h"
(...skipping 22 matching lines...) Expand all
33 #include "chrome/browser/android/compositor/tab_content_manager.h" 33 #include "chrome/browser/android/compositor/tab_content_manager.h"
34 #include "chrome/browser/android/contextualsearch/contextual_search_manager.h" 34 #include "chrome/browser/android/contextualsearch/contextual_search_manager.h"
35 #include "chrome/browser/android/contextualsearch/contextual_search_tab_helper.h " 35 #include "chrome/browser/android/contextualsearch/contextual_search_tab_helper.h "
36 #include "chrome/browser/android/cookies/cookies_fetcher.h" 36 #include "chrome/browser/android/cookies/cookies_fetcher.h"
37 #include "chrome/browser/android/data_usage/data_use_tab_ui_manager_android.h" 37 #include "chrome/browser/android/data_usage/data_use_tab_ui_manager_android.h"
38 #include "chrome/browser/android/data_usage/external_data_use_observer_bridge.h" 38 #include "chrome/browser/android/data_usage/external_data_use_observer_bridge.h"
39 #include "chrome/browser/android/dev_tools_server.h" 39 #include "chrome/browser/android/dev_tools_server.h"
40 #include "chrome/browser/android/document/document_web_contents_delegate.h" 40 #include "chrome/browser/android/document/document_web_contents_delegate.h"
41 #include "chrome/browser/android/dom_distiller/distiller_ui_handle_android.h" 41 #include "chrome/browser/android/dom_distiller/distiller_ui_handle_android.h"
42 #include "chrome/browser/android/download/chrome_download_delegate.h" 42 #include "chrome/browser/android/download/chrome_download_delegate.h"
43 #include "chrome/browser/android/download/download_controller.h"
43 #include "chrome/browser/android/download/download_manager_service.h" 44 #include "chrome/browser/android/download/download_manager_service.h"
44 #include "chrome/browser/android/favicon_helper.h" 45 #include "chrome/browser/android/favicon_helper.h"
45 #include "chrome/browser/android/feature_utilities.h" 46 #include "chrome/browser/android/feature_utilities.h"
46 #include "chrome/browser/android/feedback/connectivity_checker.h" 47 #include "chrome/browser/android/feedback/connectivity_checker.h"
47 #include "chrome/browser/android/feedback/screenshot_task.h" 48 #include "chrome/browser/android/feedback/screenshot_task.h"
48 #include "chrome/browser/android/find_in_page/find_in_page_bridge.h" 49 #include "chrome/browser/android/find_in_page/find_in_page_bridge.h"
49 #include "chrome/browser/android/foreign_session_helper.h" 50 #include "chrome/browser/android/foreign_session_helper.h"
50 #include "chrome/browser/android/history_report/history_report_jni_bridge.h" 51 #include "chrome/browser/android/history_report/history_report_jni_bridge.h"
51 #include "chrome/browser/android/intent_helper.h" 52 #include "chrome/browser/android/intent_helper.h"
52 #include "chrome/browser/android/java_exception_reporter.h" 53 #include "chrome/browser/android/java_exception_reporter.h"
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 {"CookiesFetcher", RegisterCookiesFetcher}, 260 {"CookiesFetcher", RegisterCookiesFetcher},
260 {"Credential", RegisterCredential}, 261 {"Credential", RegisterCredential},
261 {"CreditCardScanner", autofill::CreditCardScannerViewAndroid::Register}, 262 {"CreditCardScanner", autofill::CreditCardScannerViewAndroid::Register},
262 {"DataReductionProxySettings", DataReductionProxySettingsAndroid::Register}, 263 {"DataReductionProxySettings", DataReductionProxySettingsAndroid::Register},
263 {"DataUseTabUIManager", RegisterDataUseTabUIManager}, 264 {"DataUseTabUIManager", RegisterDataUseTabUIManager},
264 {"DevToolsServer", RegisterDevToolsServer}, 265 {"DevToolsServer", RegisterDevToolsServer},
265 {"DocumentWebContentsDelegate", DocumentWebContentsDelegate::Register}, 266 {"DocumentWebContentsDelegate", DocumentWebContentsDelegate::Register},
266 {"DomDistillerServiceFactory", 267 {"DomDistillerServiceFactory",
267 dom_distiller::android::DomDistillerServiceFactoryAndroid::Register}, 268 dom_distiller::android::DomDistillerServiceFactoryAndroid::Register},
268 {"DomDistillerTabUtils", RegisterDomDistillerTabUtils}, 269 {"DomDistillerTabUtils", RegisterDomDistillerTabUtils},
270 {"DownloadController", DownloadController::RegisterDownloadController},
269 {"DownloadManagerService", 271 {"DownloadManagerService",
270 DownloadManagerService::RegisterDownloadManagerService}, 272 DownloadManagerService::RegisterDownloadManagerService},
271 {"DownloadOverwriteInfoBarDelegate", 273 {"DownloadOverwriteInfoBarDelegate",
272 RegisterDownloadOverwriteInfoBarDelegate}, 274 RegisterDownloadOverwriteInfoBarDelegate},
273 {"ExternalDataUseObserverBridge", RegisterExternalDataUseObserver}, 275 {"ExternalDataUseObserverBridge", RegisterExternalDataUseObserver},
274 {"ExternalPrerenderRequestHandler", 276 {"ExternalPrerenderRequestHandler",
275 prerender::ExternalPrerenderHandlerAndroid:: 277 prerender::ExternalPrerenderHandlerAndroid::
276 RegisterExternalPrerenderHandlerAndroid}, 278 RegisterExternalPrerenderHandlerAndroid},
277 {"FaviconHelper", FaviconHelper::RegisterFaviconHelper}, 279 {"FaviconHelper", FaviconHelper::RegisterFaviconHelper},
278 {"FeatureUtilities", RegisterFeatureUtilities}, 280 {"FeatureUtilities", RegisterFeatureUtilities},
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
394 }; 396 };
395 397
396 bool RegisterBrowserJNI(JNIEnv* env) { 398 bool RegisterBrowserJNI(JNIEnv* env) {
397 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); 399 TRACE_EVENT0("startup", "chrome_android::RegisterJni");
398 return RegisterNativeMethods(env, kChromeRegisteredMethods, 400 return RegisterNativeMethods(env, kChromeRegisteredMethods,
399 arraysize(kChromeRegisteredMethods)); 401 arraysize(kChromeRegisteredMethods));
400 } 402 }
401 403
402 } // namespace android 404 } // namespace android
403 } // namespace chrome 405 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698