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

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

Issue 2781803002: Don't delete the PermissionPromptAndroid when switching tabs (Closed)
Patch Set: . Created 3 years, 8 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 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 #include "chrome/browser/ui/android/omnibox/omnibox_url_emphasizer.h" 161 #include "chrome/browser/ui/android/omnibox/omnibox_url_emphasizer.h"
162 #include "chrome/browser/ui/android/omnibox/omnibox_view_util.h" 162 #include "chrome/browser/ui/android/omnibox/omnibox_view_util.h"
163 #include "chrome/browser/ui/android/page_info/certificate_chain_helper.h" 163 #include "chrome/browser/ui/android/page_info/certificate_chain_helper.h"
164 #include "chrome/browser/ui/android/page_info/certificate_viewer_android.h" 164 #include "chrome/browser/ui/android/page_info/certificate_viewer_android.h"
165 #include "chrome/browser/ui/android/page_info/connection_info_popup_android.h" 165 #include "chrome/browser/ui/android/page_info/connection_info_popup_android.h"
166 #include "chrome/browser/ui/android/page_info/page_info_popup_android.h" 166 #include "chrome/browser/ui/android/page_info/page_info_popup_android.h"
167 #include "chrome/browser/ui/android/snackbars/auto_signin_prompt_controller.h" 167 #include "chrome/browser/ui/android/snackbars/auto_signin_prompt_controller.h"
168 #include "chrome/browser/ui/android/ssl_client_certificate_request.h" 168 #include "chrome/browser/ui/android/ssl_client_certificate_request.h"
169 #include "chrome/browser/ui/android/tab_model/single_tab_model.h" 169 #include "chrome/browser/ui/android/tab_model/single_tab_model.h"
170 #include "chrome/browser/ui/android/tab_model/tab_model_jni_bridge.h" 170 #include "chrome/browser/ui/android/tab_model/tab_model_jni_bridge.h"
171 #include "chrome/browser/ui/android/tab_model/tab_model_selector_base.h"
172 #include "chrome/browser/ui/android/toolbar/toolbar_model_android.h" 171 #include "chrome/browser/ui/android/toolbar/toolbar_model_android.h"
173 #include "chrome/browser/ui/android/usb_chooser_dialog_android.h" 172 #include "chrome/browser/ui/android/usb_chooser_dialog_android.h"
174 #include "components/dom_distiller/content/browser/android/content_jni_registrar .h" 173 #include "components/dom_distiller/content/browser/android/content_jni_registrar .h"
175 #include "components/dom_distiller/core/android/core_jni_registrar.h" 174 #include "components/dom_distiller/core/android/core_jni_registrar.h"
176 #include "components/gcm_driver/android/component_jni_registrar.h" 175 #include "components/gcm_driver/android/component_jni_registrar.h"
177 #include "components/gcm_driver/instance_id/android/component_jni_registrar.h" 176 #include "components/gcm_driver/instance_id/android/component_jni_registrar.h"
178 #include "components/invalidation/impl/android/component_jni_registrar.h" 177 #include "components/invalidation/impl/android/component_jni_registrar.h"
179 #include "components/payments/content/android/component_jni_registrar.h" 178 #include "components/payments/content/android/component_jni_registrar.h"
180 #include "components/policy/core/browser/android/component_jni_registrar.h" 179 #include "components/policy/core/browser/android/component_jni_registrar.h"
181 #include "components/safe_browsing_db/android/jni_registrar.h" 180 #include "components/safe_browsing_db/android/jni_registrar.h"
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 chrome::android::RegisterSSLClientCertificateRequestAndroid}, 400 chrome::android::RegisterSSLClientCertificateRequestAndroid},
402 {"StartupMetricUtils", chrome::android::RegisterStartupMetricUtils}, 401 {"StartupMetricUtils", chrome::android::RegisterStartupMetricUtils},
403 {"StaticTabSceneLayer", RegisterStaticTabSceneLayer}, 402 {"StaticTabSceneLayer", RegisterStaticTabSceneLayer},
404 {"SupervisedUserContentProvider", SupervisedUserContentProvider::Register}, 403 {"SupervisedUserContentProvider", SupervisedUserContentProvider::Register},
405 {"Sync", syncer::RegisterSyncJni}, 404 {"Sync", syncer::RegisterSyncJni},
406 {"SyncSessionsMetrics", SyncSessionsMetricsAndroid::Register}, 405 {"SyncSessionsMetrics", SyncSessionsMetricsAndroid::Register},
407 {"TabAndroid", TabAndroid::RegisterTabAndroid}, 406 {"TabAndroid", TabAndroid::RegisterTabAndroid},
408 {"TabContentManager", RegisterTabContentManager}, 407 {"TabContentManager", RegisterTabContentManager},
409 {"TabListSceneLayer", RegisterTabListSceneLayer}, 408 {"TabListSceneLayer", RegisterTabListSceneLayer},
410 {"TabModelJniBridge", TabModelJniBridge::Register}, 409 {"TabModelJniBridge", TabModelJniBridge::Register},
411 {"TabModelSelectorBase", RegisterTabModelSelectorBase},
412 {"TabState", RegisterTabState}, 410 {"TabState", RegisterTabState},
413 {"TabStripSceneLayer", RegisterTabStripSceneLayer}, 411 {"TabStripSceneLayer", RegisterTabStripSceneLayer},
414 {"TabWebContentsDelegateAndroid", RegisterTabWebContentsDelegateAndroid}, 412 {"TabWebContentsDelegateAndroid", RegisterTabWebContentsDelegateAndroid},
415 {"TemplateUrlServiceAndroid", TemplateUrlServiceAndroid::Register}, 413 {"TemplateUrlServiceAndroid", TemplateUrlServiceAndroid::Register},
416 {"ThumbnailProvider", ThumbnailProvider::RegisterThumbnailProvider}, 414 {"ThumbnailProvider", ThumbnailProvider::RegisterThumbnailProvider},
417 {"ToolbarModelAndroid", ToolbarModelAndroid::RegisterToolbarModelAndroid}, 415 {"ToolbarModelAndroid", ToolbarModelAndroid::RegisterToolbarModelAndroid},
418 {"ToolbarSceneLayer", RegisterToolbarSceneLayer}, 416 {"ToolbarSceneLayer", RegisterToolbarSceneLayer},
419 {"TranslateCompactInfoBar", RegisterTranslateCompactInfoBar}, 417 {"TranslateCompactInfoBar", RegisterTranslateCompactInfoBar},
420 {"TranslateInfoBarDelegate", RegisterTranslateInfoBarDelegate}, 418 {"TranslateInfoBarDelegate", RegisterTranslateInfoBarDelegate},
421 {"TtsPlatformImpl", TtsPlatformImplAndroid::Register}, 419 {"TtsPlatformImpl", TtsPlatformImplAndroid::Register},
(...skipping 25 matching lines...) Expand all
447 #endif 445 #endif
448 }; 446 };
449 447
450 bool RegisterBrowserJNI(JNIEnv* env) { 448 bool RegisterBrowserJNI(JNIEnv* env) {
451 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); 449 TRACE_EVENT0("startup", "chrome_android::RegisterJni");
452 return RegisterNativeMethods(env, kChromeRegisteredMethods, 450 return RegisterNativeMethods(env, kChromeRegisteredMethods,
453 arraysize(kChromeRegisteredMethods)); 451 arraysize(kChromeRegisteredMethods));
454 } 452 }
455 453
456 } // namespace android 454 } // namespace android
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698