OLD | NEW |
---|---|
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/ui/android/infobars/tabbed_mode_opt_in_infobar_delegate .h> | |
5 #include "chrome/browser/android/chrome_jni_registrar.h" | 6 #include "chrome/browser/android/chrome_jni_registrar.h" |
6 | 7 |
7 #include "base/android/jni_android.h" | 8 #include "base/android/jni_android.h" |
8 #include "base/android/jni_registrar.h" | 9 #include "base/android/jni_registrar.h" |
9 #include "base/trace_event/trace_event.h" | 10 #include "base/trace_event/trace_event.h" |
10 #include "chrome/browser/after_startup_task_utils_android.h" | 11 #include "chrome/browser/after_startup_task_utils_android.h" |
11 #include "chrome/browser/android/accessibility/font_size_prefs_android.h" | 12 #include "chrome/browser/android/accessibility/font_size_prefs_android.h" |
12 #include "chrome/browser/android/accessibility_util.h" | 13 #include "chrome/browser/android/accessibility_util.h" |
13 #include "chrome/browser/android/appmenu/app_menu_drag_helper.h" | 14 #include "chrome/browser/android/appmenu/app_menu_drag_helper.h" |
14 #include "chrome/browser/android/background_sync_launcher_android.h" | 15 #include "chrome/browser/android/background_sync_launcher_android.h" |
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
328 {"SessionTabHelper", RegisterSessionTabHelper}, | 329 {"SessionTabHelper", RegisterSessionTabHelper}, |
329 {"SigninManager", SigninManagerAndroid::Register}, | 330 {"SigninManager", SigninManagerAndroid::Register}, |
330 {"SingleTabModel", RegisterSingleTabModel}, | 331 {"SingleTabModel", RegisterSingleTabModel}, |
331 {"SpellCheckerSessionBridge", SpellCheckerSessionBridge::RegisterJNI}, | 332 {"SpellCheckerSessionBridge", SpellCheckerSessionBridge::RegisterJNI}, |
332 {"SqliteCursor", SQLiteCursor::RegisterSqliteCursor}, | 333 {"SqliteCursor", SQLiteCursor::RegisterSqliteCursor}, |
333 {"SSLClientCertificateRequest", RegisterSSLClientCertificateRequestAndroid}, | 334 {"SSLClientCertificateRequest", RegisterSSLClientCertificateRequestAndroid}, |
334 {"StartupMetricUtils", RegisterStartupMetricUtils}, | 335 {"StartupMetricUtils", RegisterStartupMetricUtils}, |
335 {"StaticTabSceneLayer", chrome::android::RegisterStaticTabSceneLayer}, | 336 {"StaticTabSceneLayer", chrome::android::RegisterStaticTabSceneLayer}, |
336 {"Sync", syncer::RegisterSyncJni}, | 337 {"Sync", syncer::RegisterSyncJni}, |
337 {"TabAndroid", TabAndroid::RegisterTabAndroid}, | 338 {"TabAndroid", TabAndroid::RegisterTabAndroid}, |
339 {"TabbedModeOptInInfobarDelegate", | |
gone
2015/11/17 23:18:16
Keep your InfoBar and Infobar naming consistent.
Kibeom Kim (inactive)
2015/11/20 11:44:15
Done.
| |
340 TabbedModeOptInInfoBarDelegate::RegisterTabbedModeOptInInfoBarDelegate}, | |
338 {"TabContentManager", chrome::android::RegisterTabContentManager}, | 341 {"TabContentManager", chrome::android::RegisterTabContentManager}, |
339 {"TabListSceneLayer", RegisterTabListSceneLayer}, | 342 {"TabListSceneLayer", RegisterTabListSceneLayer}, |
340 {"TabModelJniBridge", TabModelJniBridge::Register}, | 343 {"TabModelJniBridge", TabModelJniBridge::Register}, |
341 {"TabState", RegisterTabState}, | 344 {"TabState", RegisterTabState}, |
342 {"TabStripSceneLayer", RegisterTabStripSceneLayer}, | 345 {"TabStripSceneLayer", RegisterTabStripSceneLayer}, |
343 {"TabWebContentsDelegateAndroid", RegisterTabWebContentsDelegateAndroid}, | 346 {"TabWebContentsDelegateAndroid", RegisterTabWebContentsDelegateAndroid}, |
344 {"TemplateUrlServiceAndroid", TemplateUrlServiceAndroid::Register}, | 347 {"TemplateUrlServiceAndroid", TemplateUrlServiceAndroid::Register}, |
345 {"ToolbarModelAndroid", ToolbarModelAndroid::RegisterToolbarModelAndroid}, | 348 {"ToolbarModelAndroid", ToolbarModelAndroid::RegisterToolbarModelAndroid}, |
346 {"TranslateInfoBarDelegate", RegisterTranslateInfoBarDelegate}, | 349 {"TranslateInfoBarDelegate", RegisterTranslateInfoBarDelegate}, |
347 {"TtsPlatformImpl", TtsPlatformImplAndroid::Register}, | 350 {"TtsPlatformImpl", TtsPlatformImplAndroid::Register}, |
(...skipping 15 matching lines...) Expand all Loading... | |
363 }; | 366 }; |
364 | 367 |
365 bool RegisterBrowserJNI(JNIEnv* env) { | 368 bool RegisterBrowserJNI(JNIEnv* env) { |
366 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); | 369 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); |
367 return RegisterNativeMethods(env, kChromeRegisteredMethods, | 370 return RegisterNativeMethods(env, kChromeRegisteredMethods, |
368 arraysize(kChromeRegisteredMethods)); | 371 arraysize(kChromeRegisteredMethods)); |
369 } | 372 } |
370 | 373 |
371 } // namespace android | 374 } // namespace android |
372 } // namespace chrome | 375 } // namespace chrome |
OLD | NEW |