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

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

Issue 516703002: Replaced the current WebsiteSettings dialog with a new PageInfo dialog (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added missing template files for PageInfoConnectionType enum Created 6 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/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
10 #include "chrome/browser/android/accessibility/font_size_prefs_android.h" 10 #include "chrome/browser/android/accessibility/font_size_prefs_android.h"
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 #include "chrome/browser/ui/android/infobars/infobar_container_android.h" 66 #include "chrome/browser/ui/android/infobars/infobar_container_android.h"
67 #include "chrome/browser/ui/android/infobars/save_password_infobar.h" 67 #include "chrome/browser/ui/android/infobars/save_password_infobar.h"
68 #include "chrome/browser/ui/android/infobars/translate_infobar.h" 68 #include "chrome/browser/ui/android/infobars/translate_infobar.h"
69 #include "chrome/browser/ui/android/javascript_app_modal_dialog_android.h" 69 #include "chrome/browser/ui/android/javascript_app_modal_dialog_android.h"
70 #include "chrome/browser/ui/android/navigation_popup.h" 70 #include "chrome/browser/ui/android/navigation_popup.h"
71 #include "chrome/browser/ui/android/omnibox/omnibox_view_util.h" 71 #include "chrome/browser/ui/android/omnibox/omnibox_view_util.h"
72 #include "chrome/browser/ui/android/ssl_client_certificate_request.h" 72 #include "chrome/browser/ui/android/ssl_client_certificate_request.h"
73 #include "chrome/browser/ui/android/tab_model/tab_model_base.h" 73 #include "chrome/browser/ui/android/tab_model/tab_model_base.h"
74 #include "chrome/browser/ui/android/toolbar/toolbar_model_android.h" 74 #include "chrome/browser/ui/android/toolbar/toolbar_model_android.h"
75 #include "chrome/browser/ui/android/website_settings_popup_android.h" 75 #include "chrome/browser/ui/android/website_settings_popup_android.h"
76 #include "chrome/browser/ui/android/website_settings_popup_legacy_android.h"
76 #include "components/bookmarks/common/android/component_jni_registrar.h" 77 #include "components/bookmarks/common/android/component_jni_registrar.h"
77 #include "components/dom_distiller/android/component_jni_registrar.h" 78 #include "components/dom_distiller/android/component_jni_registrar.h"
78 #include "components/enhanced_bookmarks/android/component_jni_registrar.h" 79 #include "components/enhanced_bookmarks/android/component_jni_registrar.h"
79 #include "components/gcm_driver/android/component_jni_registrar.h" 80 #include "components/gcm_driver/android/component_jni_registrar.h"
80 #include "components/navigation_interception/component_jni_registrar.h" 81 #include "components/navigation_interception/component_jni_registrar.h"
81 #include "components/variations/android/component_jni_registrar.h" 82 #include "components/variations/android/component_jni_registrar.h"
82 #include "components/web_contents_delegate_android/component_jni_registrar.h" 83 #include "components/web_contents_delegate_android/component_jni_registrar.h"
83 84
84 #if defined(ENABLE_PRINTING) && !defined(ENABLE_FULL_PRINTING) 85 #if defined(ENABLE_PRINTING) && !defined(ENABLE_FULL_PRINTING)
85 #include "printing/printing_context_android.h" 86 #include "printing/printing_context_android.h"
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 { "TemplateUrlServiceAndroid", TemplateUrlServiceAndroid::Register }, 184 { "TemplateUrlServiceAndroid", TemplateUrlServiceAndroid::Register },
184 { "ToolbarModelAndroid", ToolbarModelAndroid::RegisterToolbarModelAndroid }, 185 { "ToolbarModelAndroid", ToolbarModelAndroid::RegisterToolbarModelAndroid },
185 { "TranslateInfoBarDelegate", RegisterTranslateInfoBarDelegate }, 186 { "TranslateInfoBarDelegate", RegisterTranslateInfoBarDelegate },
186 { "TtsPlatformImpl", TtsPlatformImplAndroid::Register }, 187 { "TtsPlatformImpl", TtsPlatformImplAndroid::Register },
187 { "UmaBridge", RegisterUmaBridge }, 188 { "UmaBridge", RegisterUmaBridge },
188 { "UrlUtilities", RegisterUrlUtilities }, 189 { "UrlUtilities", RegisterUrlUtilities },
189 { "Variations", variations::android::RegisterVariations }, 190 { "Variations", variations::android::RegisterVariations },
190 { "VoiceSearchTabHelper", RegisterVoiceSearchTabHelper }, 191 { "VoiceSearchTabHelper", RegisterVoiceSearchTabHelper },
191 { "WebsiteSettingsPopupAndroid", 192 { "WebsiteSettingsPopupAndroid",
192 WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid }, 193 WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid },
194 { "WebsiteSettingsPopupLegacyAndroid",
195 WebsiteSettingsPopupLegacyAndroid::
196 RegisterWebsiteSettingsPopupLegacyAndroid },
193 #if defined(ENABLE_PRINTING) && !defined(ENABLE_FULL_PRINTING) 197 #if defined(ENABLE_PRINTING) && !defined(ENABLE_FULL_PRINTING)
194 { "PrintingContext", 198 { "PrintingContext",
195 printing::PrintingContextAndroid::RegisterPrintingContext}, 199 printing::PrintingContextAndroid::RegisterPrintingContext},
196 #endif 200 #endif
197 }; 201 };
198 202
199 bool RegisterJni(JNIEnv* env) { 203 bool RegisterJni(JNIEnv* env) {
200 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); 204 TRACE_EVENT0("startup", "chrome_android::RegisterJni");
201 return RegisterNativeMethods(env, kChromeRegisteredMethods, 205 return RegisterNativeMethods(env, kChromeRegisteredMethods,
202 arraysize(kChromeRegisteredMethods)); 206 arraysize(kChromeRegisteredMethods));
203 } 207 }
204 208
205 } // namespace android 209 } // namespace android
206 } // namespace chrome 210 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698