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

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

Issue 1435263003: [Android] Show document mode opt-out InfoBar on selected devices. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: addressed Dan's comments 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/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 311 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 {"SessionTabHelper", RegisterSessionTabHelper}, 327 {"SessionTabHelper", RegisterSessionTabHelper},
327 {"SigninManager", SigninManagerAndroid::Register}, 328 {"SigninManager", SigninManagerAndroid::Register},
328 {"SingleTabModel", RegisterSingleTabModel}, 329 {"SingleTabModel", RegisterSingleTabModel},
329 {"SpellCheckerSessionBridge", SpellCheckerSessionBridge::RegisterJNI}, 330 {"SpellCheckerSessionBridge", SpellCheckerSessionBridge::RegisterJNI},
330 {"SqliteCursor", SQLiteCursor::RegisterSqliteCursor}, 331 {"SqliteCursor", SQLiteCursor::RegisterSqliteCursor},
331 {"SSLClientCertificateRequest", RegisterSSLClientCertificateRequestAndroid}, 332 {"SSLClientCertificateRequest", RegisterSSLClientCertificateRequestAndroid},
332 {"StartupMetricUtils", RegisterStartupMetricUtils}, 333 {"StartupMetricUtils", RegisterStartupMetricUtils},
333 {"StaticTabSceneLayer", chrome::android::RegisterStaticTabSceneLayer}, 334 {"StaticTabSceneLayer", chrome::android::RegisterStaticTabSceneLayer},
334 {"Sync", syncer::RegisterSyncJni}, 335 {"Sync", syncer::RegisterSyncJni},
335 {"TabAndroid", TabAndroid::RegisterTabAndroid}, 336 {"TabAndroid", TabAndroid::RegisterTabAndroid},
337 {"TabbedModeOptInInfoBarDelegate",
338 TabbedModeOptInInfoBarDelegate::RegisterTabbedModeOptInInfoBarDelegate},
336 {"TabContentManager", chrome::android::RegisterTabContentManager}, 339 {"TabContentManager", chrome::android::RegisterTabContentManager},
337 {"TabListSceneLayer", RegisterTabListSceneLayer}, 340 {"TabListSceneLayer", RegisterTabListSceneLayer},
338 {"TabModelJniBridge", TabModelJniBridge::Register}, 341 {"TabModelJniBridge", TabModelJniBridge::Register},
339 {"TabState", RegisterTabState}, 342 {"TabState", RegisterTabState},
340 {"TabStripSceneLayer", RegisterTabStripSceneLayer}, 343 {"TabStripSceneLayer", RegisterTabStripSceneLayer},
341 {"TabWebContentsDelegateAndroid", RegisterTabWebContentsDelegateAndroid}, 344 {"TabWebContentsDelegateAndroid", RegisterTabWebContentsDelegateAndroid},
342 {"TemplateUrlServiceAndroid", TemplateUrlServiceAndroid::Register}, 345 {"TemplateUrlServiceAndroid", TemplateUrlServiceAndroid::Register},
343 {"ToolbarModelAndroid", ToolbarModelAndroid::RegisterToolbarModelAndroid}, 346 {"ToolbarModelAndroid", ToolbarModelAndroid::RegisterToolbarModelAndroid},
344 {"TranslateInfoBarDelegate", RegisterTranslateInfoBarDelegate}, 347 {"TranslateInfoBarDelegate", RegisterTranslateInfoBarDelegate},
345 {"TtsPlatformImpl", TtsPlatformImplAndroid::Register}, 348 {"TtsPlatformImpl", TtsPlatformImplAndroid::Register},
(...skipping 15 matching lines...) Expand all
361 }; 364 };
362 365
363 bool RegisterBrowserJNI(JNIEnv* env) { 366 bool RegisterBrowserJNI(JNIEnv* env) {
364 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); 367 TRACE_EVENT0("startup", "chrome_android::RegisterJni");
365 return RegisterNativeMethods(env, kChromeRegisteredMethods, 368 return RegisterNativeMethods(env, kChromeRegisteredMethods,
366 arraysize(kChromeRegisteredMethods)); 369 arraysize(kChromeRegisteredMethods));
367 } 370 }
368 371
369 } // namespace android 372 } // namespace android
370 } // namespace chrome 373 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698