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

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

Issue 1283223004: Contextual Search Panel should own ContentViewCore (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Override wrappers instead of native Created 5 years, 3 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/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/banners/app_banner_infobar_delegate_android.h" 14 #include "chrome/browser/android/banners/app_banner_infobar_delegate_android.h"
15 #include "chrome/browser/android/banners/app_banner_manager_android.h" 15 #include "chrome/browser/android/banners/app_banner_manager_android.h"
16 #include "chrome/browser/android/bookmarks/bookmarks_bridge.h" 16 #include "chrome/browser/android/bookmarks/bookmarks_bridge.h"
17 #include "chrome/browser/android/bookmarks/edit_bookmark_helper.h" 17 #include "chrome/browser/android/bookmarks/edit_bookmark_helper.h"
18 #include "chrome/browser/android/bookmarks/partner_bookmarks_reader.h" 18 #include "chrome/browser/android/bookmarks/partner_bookmarks_reader.h"
19 #include "chrome/browser/android/bottombar/contextualsearch/contextual_search_pa nel.h"
19 #include "chrome/browser/android/chrome_application.h" 20 #include "chrome/browser/android/chrome_application.h"
20 #include "chrome/browser/android/chrome_web_contents_delegate_android.h" 21 #include "chrome/browser/android/chrome_web_contents_delegate_android.h"
21 #include "chrome/browser/android/compositor/compositor_view.h" 22 #include "chrome/browser/android/compositor/compositor_view.h"
22 #include "chrome/browser/android/compositor/layer_title_cache.h" 23 #include "chrome/browser/android/compositor/layer_title_cache.h"
23 #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"
24 #include "chrome/browser/android/compositor/scene_layer/reader_mode_scene_layer. h" 25 #include "chrome/browser/android/compositor/scene_layer/reader_mode_scene_layer. h"
25 #include "chrome/browser/android/compositor/scene_layer/scene_layer.h" 26 #include "chrome/browser/android/compositor/scene_layer/scene_layer.h"
26 #include "chrome/browser/android/compositor/scene_layer/static_tab_scene_layer.h " 27 #include "chrome/browser/android/compositor/scene_layer/static_tab_scene_layer.h "
27 #include "chrome/browser/android/compositor/scene_layer/tab_list_scene_layer.h" 28 #include "chrome/browser/android/compositor/scene_layer/tab_list_scene_layer.h"
28 #include "chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer.h" 29 #include "chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer.h"
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 {"ChromeWebContentsDelegateAndroid", 209 {"ChromeWebContentsDelegateAndroid",
209 RegisterChromeWebContentsDelegateAndroid}, 210 RegisterChromeWebContentsDelegateAndroid},
210 {"CompositorView", RegisterCompositorView}, 211 {"CompositorView", RegisterCompositorView},
211 {"ConfirmInfoBarDelegate", RegisterConfirmInfoBarDelegate}, 212 {"ConfirmInfoBarDelegate", RegisterConfirmInfoBarDelegate},
212 {"ConnectionInfoPopupAndroid", 213 {"ConnectionInfoPopupAndroid",
213 ConnectionInfoPopupAndroid::RegisterConnectionInfoPopupAndroid}, 214 ConnectionInfoPopupAndroid::RegisterConnectionInfoPopupAndroid},
214 {"ConnectionSecurity", RegisterConnectionSecurityAndroid}, 215 {"ConnectionSecurity", RegisterConnectionSecurityAndroid},
215 {"ConnectivityChecker", RegisterConnectivityChecker}, 216 {"ConnectivityChecker", RegisterConnectivityChecker},
216 {"ContextMenuHelper", RegisterContextMenuHelper}, 217 {"ContextMenuHelper", RegisterContextMenuHelper},
217 {"ContextualSearchManager", RegisterContextualSearchManager}, 218 {"ContextualSearchManager", RegisterContextualSearchManager},
219 {"ContextualSearchPanel", RegisterContextualSearchPanel},
218 {"ContextualSearchSceneLayer", RegisterContextualSearchSceneLayer}, 220 {"ContextualSearchSceneLayer", RegisterContextualSearchSceneLayer},
219 {"ContextualSearchTabHelper", RegisterContextualSearchTabHelper}, 221 {"ContextualSearchTabHelper", RegisterContextualSearchTabHelper},
220 {"CookiesFetcher", RegisterCookiesFetcher}, 222 {"CookiesFetcher", RegisterCookiesFetcher},
221 {"Credential", RegisterCredential}, 223 {"Credential", RegisterCredential},
222 {"CreditCardScanner", autofill::CreditCardScannerViewAndroid::Register}, 224 {"CreditCardScanner", autofill::CreditCardScannerViewAndroid::Register},
223 {"DataReductionProxyInfoBarDelegate", DataReductionProxyInfoBar::Register}, 225 {"DataReductionProxyInfoBarDelegate", DataReductionProxyInfoBar::Register},
224 {"DataReductionProxySettings", DataReductionProxySettingsAndroid::Register}, 226 {"DataReductionProxySettings", DataReductionProxySettingsAndroid::Register},
225 {"DevToolsServer", RegisterDevToolsServer}, 227 {"DevToolsServer", RegisterDevToolsServer},
226 {"DocumentWebContentsDelegate", DocumentWebContentsDelegate::Register}, 228 {"DocumentWebContentsDelegate", DocumentWebContentsDelegate::Register},
227 {"DomDistillerServiceFactory", 229 {"DomDistillerServiceFactory",
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 }; 335 };
334 336
335 bool RegisterBrowserJNI(JNIEnv* env) { 337 bool RegisterBrowserJNI(JNIEnv* env) {
336 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); 338 TRACE_EVENT0("startup", "chrome_android::RegisterJni");
337 return RegisterNativeMethods(env, kChromeRegisteredMethods, 339 return RegisterNativeMethods(env, kChromeRegisteredMethods,
338 arraysize(kChromeRegisteredMethods)); 340 arraysize(kChromeRegisteredMethods));
339 } 341 }
340 342
341 } // namespace android 343 } // namespace android
342 } // namespace chrome 344 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698