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

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

Issue 1436743002: Integrate new Reader Mode panel (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scene-layer-changes
Patch Set: Created 5 years, 1 month 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/after_startup_task_utils_android.h" 10 #include "chrome/browser/after_startup_task_utils_android.h"
11 #include "chrome/browser/android/accessibility/font_size_prefs_android.h" 11 #include "chrome/browser/android/accessibility/font_size_prefs_android.h"
12 #include "chrome/browser/android/accessibility_util.h" 12 #include "chrome/browser/android/accessibility_util.h"
13 #include "chrome/browser/android/appmenu/app_menu_drag_helper.h" 13 #include "chrome/browser/android/appmenu/app_menu_drag_helper.h"
14 #include "chrome/browser/android/background_sync_launcher_android.h" 14 #include "chrome/browser/android/background_sync_launcher_android.h"
15 #include "chrome/browser/android/banners/app_banner_infobar_delegate_android.h" 15 #include "chrome/browser/android/banners/app_banner_infobar_delegate_android.h"
16 #include "chrome/browser/android/banners/app_banner_manager_android.h" 16 #include "chrome/browser/android/banners/app_banner_manager_android.h"
17 #include "chrome/browser/android/bookmarks/bookmarks_bridge.h" 17 #include "chrome/browser/android/bookmarks/bookmarks_bridge.h"
18 #include "chrome/browser/android/bookmarks/edit_bookmark_helper.h" 18 #include "chrome/browser/android/bookmarks/edit_bookmark_helper.h"
19 #include "chrome/browser/android/bookmarks/partner_bookmarks_reader.h" 19 #include "chrome/browser/android/bookmarks/partner_bookmarks_reader.h"
20 #include "chrome/browser/android/bottombar/overlay_panel_content.h" 20 #include "chrome/browser/android/bottombar/overlay_panel_content.h"
21 #include "chrome/browser/android/chrome_application.h" 21 #include "chrome/browser/android/chrome_application.h"
22 #include "chrome/browser/android/compositor/compositor_view.h" 22 #include "chrome/browser/android/compositor/compositor_view.h"
23 #include "chrome/browser/android/compositor/layer_title_cache.h" 23 #include "chrome/browser/android/compositor/layer_title_cache.h"
24 #include "chrome/browser/android/compositor/scene_layer/contextual_search_scene_ layer.h" 24 #include "chrome/browser/android/compositor/scene_layer/contextual_search_scene_ layer.h"
25 #include "chrome/browser/android/compositor/scene_layer/reader_mode_scene_layer. h"
26 #include "chrome/browser/android/compositor/scene_layer/scene_layer.h" 25 #include "chrome/browser/android/compositor/scene_layer/scene_layer.h"
27 #include "chrome/browser/android/compositor/scene_layer/static_tab_scene_layer.h " 26 #include "chrome/browser/android/compositor/scene_layer/static_tab_scene_layer.h "
28 #include "chrome/browser/android/compositor/scene_layer/tab_list_scene_layer.h" 27 #include "chrome/browser/android/compositor/scene_layer/tab_list_scene_layer.h"
29 #include "chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer.h" 28 #include "chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer.h"
30 #include "chrome/browser/android/compositor/tab_content_manager.h" 29 #include "chrome/browser/android/compositor/tab_content_manager.h"
31 #include "chrome/browser/android/contextualsearch/contextual_search_manager.h" 30 #include "chrome/browser/android/contextualsearch/contextual_search_manager.h"
32 #include "chrome/browser/android/contextualsearch/contextual_search_tab_helper.h " 31 #include "chrome/browser/android/contextualsearch/contextual_search_tab_helper.h "
33 #include "chrome/browser/android/cookies/cookies_fetcher.h" 32 #include "chrome/browser/android/cookies/cookies_fetcher.h"
34 #include "chrome/browser/android/data_usage/data_use_tab_ui_manager_android.h" 33 #include "chrome/browser/android/data_usage/data_use_tab_ui_manager_android.h"
35 #include "chrome/browser/android/data_usage/external_data_use_observer.h" 34 #include "chrome/browser/android/data_usage/external_data_use_observer.h"
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 {"PermissionUpdateInfoBarDelegate", 302 {"PermissionUpdateInfoBarDelegate",
304 PermissionUpdateInfoBarDelegate::RegisterPermissionUpdateInfoBarDelegate}, 303 PermissionUpdateInfoBarDelegate::RegisterPermissionUpdateInfoBarDelegate},
305 {"PersonalDataManagerAndroid", 304 {"PersonalDataManagerAndroid",
306 autofill::PersonalDataManagerAndroid::Register}, 305 autofill::PersonalDataManagerAndroid::Register},
307 {"PrecacheLauncher", RegisterPrecacheLauncher}, 306 {"PrecacheLauncher", RegisterPrecacheLauncher},
308 {"PrefServiceBridge", PrefServiceBridge::RegisterPrefServiceBridge}, 307 {"PrefServiceBridge", PrefServiceBridge::RegisterPrefServiceBridge},
309 {"ProfileAndroid", ProfileAndroid::RegisterProfileAndroid}, 308 {"ProfileAndroid", ProfileAndroid::RegisterProfileAndroid},
310 {"ProfileDownloader", RegisterProfileDownloader}, 309 {"ProfileDownloader", RegisterProfileDownloader},
311 {"ProfileSyncService", ProfileSyncServiceAndroid::Register}, 310 {"ProfileSyncService", ProfileSyncServiceAndroid::Register},
312 {"RapporServiceBridge", rappor::RegisterRapporServiceBridge}, 311 {"RapporServiceBridge", rappor::RegisterRapporServiceBridge},
313 {"ReaderModeSceneLayer", RegisterReaderModeSceneLayer},
314 {"RecentlyClosedBridge", RecentlyClosedTabsBridge::Register}, 312 {"RecentlyClosedBridge", RecentlyClosedTabsBridge::Register},
315 {"RecordCastAction", remote_media::RegisterRecordCastAction}, 313 {"RecordCastAction", remote_media::RegisterRecordCastAction},
316 {"RemoteMediaPlayerBridge", 314 {"RemoteMediaPlayerBridge",
317 remote_media::RemoteMediaPlayerBridge::RegisterRemoteMediaPlayerBridge}, 315 remote_media::RemoteMediaPlayerBridge::RegisterRemoteMediaPlayerBridge},
318 {"RevenueStats", RegisterRevenueStats}, 316 {"RevenueStats", RegisterRevenueStats},
319 {"SavePasswordInfoBar", SavePasswordInfoBar::Register}, 317 {"SavePasswordInfoBar", SavePasswordInfoBar::Register},
320 {"AutoSigninFirstRunInfoBar", AutoSigninFirstRunInfoBar::Register}, 318 {"AutoSigninFirstRunInfoBar", AutoSigninFirstRunInfoBar::Register},
321 {"SceneLayer", chrome::android::RegisterSceneLayer}, 319 {"SceneLayer", chrome::android::RegisterSceneLayer},
322 {"ScreenshotTask", RegisterScreenshotTask}, 320 {"ScreenshotTask", RegisterScreenshotTask},
323 {"ServiceTabLauncher", service_tab_launcher::RegisterServiceTabLauncherJni}, 321 {"ServiceTabLauncher", service_tab_launcher::RegisterServiceTabLauncherJni},
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
358 }; 356 };
359 357
360 bool RegisterBrowserJNI(JNIEnv* env) { 358 bool RegisterBrowserJNI(JNIEnv* env) {
361 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); 359 TRACE_EVENT0("startup", "chrome_android::RegisterJni");
362 return RegisterNativeMethods(env, kChromeRegisteredMethods, 360 return RegisterNativeMethods(env, kChromeRegisteredMethods,
363 arraysize(kChromeRegisteredMethods)); 361 arraysize(kChromeRegisteredMethods));
364 } 362 }
365 363
366 } // namespace android 364 } // namespace android
367 } // namespace chrome 365 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698