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

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

Issue 1240923002: Add an infobar to resolve android runtime permission mismatches. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address dfalcantara@ comment Created 5 years, 5 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/android/accessibility/font_size_prefs_android.h" 10 #include "chrome/browser/android/accessibility/font_size_prefs_android.h"
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 #include "chrome/browser/dom_distiller/tab_utils_android.h" 80 #include "chrome/browser/dom_distiller/tab_utils_android.h"
81 #include "chrome/browser/enhanced_bookmarks/android/enhanced_bookmarks_bridge.h" 81 #include "chrome/browser/enhanced_bookmarks/android/enhanced_bookmarks_bridge.h"
82 #include "chrome/browser/history/android/sqlite_cursor.h" 82 #include "chrome/browser/history/android/sqlite_cursor.h"
83 #include "chrome/browser/invalidation/invalidation_service_factory_android.h" 83 #include "chrome/browser/invalidation/invalidation_service_factory_android.h"
84 #include "chrome/browser/lifetime/application_lifetime_android.h" 84 #include "chrome/browser/lifetime/application_lifetime_android.h"
85 #include "chrome/browser/media/android/remote/record_cast_action.h" 85 #include "chrome/browser/media/android/remote/record_cast_action.h"
86 #include "chrome/browser/media/android/remote/remote_media_player_bridge.h" 86 #include "chrome/browser/media/android/remote/remote_media_player_bridge.h"
87 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.h" 87 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.h"
88 #include "chrome/browser/notifications/notification_ui_manager_android.h" 88 #include "chrome/browser/notifications/notification_ui_manager_android.h"
89 #include "chrome/browser/password_manager/credential_android.h" 89 #include "chrome/browser/password_manager/credential_android.h"
90 #include "chrome/browser/permissions/permission_update_infobar_delegate_android. h"
90 #include "chrome/browser/prerender/external_prerender_handler_android.h" 91 #include "chrome/browser/prerender/external_prerender_handler_android.h"
91 #include "chrome/browser/profiles/profile_android.h" 92 #include "chrome/browser/profiles/profile_android.h"
92 #include "chrome/browser/search_engines/template_url_service_android.h" 93 #include "chrome/browser/search_engines/template_url_service_android.h"
93 #include "chrome/browser/signin/oauth2_token_service_delegate_android.h" 94 #include "chrome/browser/signin/oauth2_token_service_delegate_android.h"
94 #include "chrome/browser/speech/tts_android.h" 95 #include "chrome/browser/speech/tts_android.h"
95 #include "chrome/browser/ssl/connection_security_android.h" 96 #include "chrome/browser/ssl/connection_security_android.h"
96 #include "chrome/browser/supervised_user/child_accounts/child_account_feedback_r eporter_android.h" 97 #include "chrome/browser/supervised_user/child_accounts/child_account_feedback_r eporter_android.h"
97 #include "chrome/browser/supervised_user/child_accounts/child_account_service_an droid.h" 98 #include "chrome/browser/supervised_user/child_accounts/child_account_service_an droid.h"
98 #include "chrome/browser/sync/profile_sync_service_android.h" 99 #include "chrome/browser/sync/profile_sync_service_android.h"
99 #include "chrome/browser/ui/android/autofill/autofill_dialog_controller_android. h" 100 #include "chrome/browser/ui/android/autofill/autofill_dialog_controller_android. h"
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 {"OmniboxPrerender", RegisterOmniboxPrerender}, 260 {"OmniboxPrerender", RegisterOmniboxPrerender},
260 {"OmniboxUrlEmphasizer", 261 {"OmniboxUrlEmphasizer",
261 OmniboxUrlEmphasizer::RegisterOmniboxUrlEmphasizer}, 262 OmniboxUrlEmphasizer::RegisterOmniboxUrlEmphasizer},
262 {"OmniboxViewUtil", OmniboxViewUtil::RegisterOmniboxViewUtil}, 263 {"OmniboxViewUtil", OmniboxViewUtil::RegisterOmniboxViewUtil},
263 {"PartnerBookmarksReader", 264 {"PartnerBookmarksReader",
264 PartnerBookmarksReader::RegisterPartnerBookmarksReader}, 265 PartnerBookmarksReader::RegisterPartnerBookmarksReader},
265 {"PasswordGenerationPopup", 266 {"PasswordGenerationPopup",
266 autofill::PasswordGenerationPopupViewAndroid::Register}, 267 autofill::PasswordGenerationPopupViewAndroid::Register},
267 {"PasswordUIViewAndroid", 268 {"PasswordUIViewAndroid",
268 PasswordUIViewAndroid::RegisterPasswordUIViewAndroid}, 269 PasswordUIViewAndroid::RegisterPasswordUIViewAndroid},
270 {"PermissionUpdateInfoBarDelegate",
271 PermissionUpdateInfoBarDelegate::RegisterPermissionUpdateInfoBarDelegate},
269 {"PersonalDataManagerAndroid", 272 {"PersonalDataManagerAndroid",
270 autofill::PersonalDataManagerAndroid::Register}, 273 autofill::PersonalDataManagerAndroid::Register},
271 {"PolicyManager", RegisterPolicyManager}, 274 {"PolicyManager", RegisterPolicyManager},
272 {"PrecacheLauncher", RegisterPrecacheLauncher}, 275 {"PrecacheLauncher", RegisterPrecacheLauncher},
273 {"PrefServiceBridge", PrefServiceBridge::RegisterPrefServiceBridge}, 276 {"PrefServiceBridge", PrefServiceBridge::RegisterPrefServiceBridge},
274 {"ProfileAndroid", ProfileAndroid::RegisterProfileAndroid}, 277 {"ProfileAndroid", ProfileAndroid::RegisterProfileAndroid},
275 {"ProfileDownloader", RegisterProfileDownloader}, 278 {"ProfileDownloader", RegisterProfileDownloader},
276 {"ProfileSyncService", ProfileSyncServiceAndroid::Register}, 279 {"ProfileSyncService", ProfileSyncServiceAndroid::Register},
277 {"ReaderModeSceneLayer", RegisterReaderModeSceneLayer}, 280 {"ReaderModeSceneLayer", RegisterReaderModeSceneLayer},
278 {"RecentlyClosedBridge", RecentlyClosedTabsBridge::Register}, 281 {"RecentlyClosedBridge", RecentlyClosedTabsBridge::Register},
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 }; 319 };
317 320
318 bool RegisterBrowserJNI(JNIEnv* env) { 321 bool RegisterBrowserJNI(JNIEnv* env) {
319 TRACE_EVENT0("startup", "chrome_android::RegisterJni"); 322 TRACE_EVENT0("startup", "chrome_android::RegisterJni");
320 return RegisterNativeMethods(env, kChromeRegisteredMethods, 323 return RegisterNativeMethods(env, kChromeRegisteredMethods,
321 arraysize(kChromeRegisteredMethods)); 324 arraysize(kChromeRegisteredMethods));
322 } 325 }
323 326
324 } // namespace android 327 } // namespace android
325 } // namespace chrome 328 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698