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

Side by Side Diff: chrome/browser/geolocation/geolocation_infobar_delegate_android.cc

Issue 2415863002: Use PermissionType instead of ContentSettingsType in Android permission infobars (Closed)
Patch Set: Merge branch 'master' into use_permission_type_for_infobar Created 4 years, 2 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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/geolocation/geolocation_infobar_delegate_android.h" 5 #include "chrome/browser/geolocation/geolocation_infobar_delegate_android.h"
6 6
7 #include "chrome/browser/android/android_theme_resources.h" 7 #include "chrome/browser/android/android_theme_resources.h"
8 #include "chrome/browser/infobars/infobar_service.h" 8 #include "chrome/browser/infobars/infobar_service.h"
9 #include "chrome/grit/generated_resources.h" 9 #include "chrome/grit/generated_resources.h"
10 #include "components/infobars/core/infobar.h" 10 #include "components/infobars/core/infobar.h"
(...skipping 11 matching lines...) Expand all
22 profile, callback)))); 22 profile, callback))));
23 } 23 }
24 24
25 GeolocationInfoBarDelegateAndroid::GeolocationInfoBarDelegateAndroid( 25 GeolocationInfoBarDelegateAndroid::GeolocationInfoBarDelegateAndroid(
26 const GURL& requesting_frame, 26 const GURL& requesting_frame,
27 bool user_gesture, 27 bool user_gesture,
28 Profile* profile, 28 Profile* profile,
29 const PermissionSetCallback& callback) 29 const PermissionSetCallback& callback)
30 : PermissionInfoBarDelegate(requesting_frame, 30 : PermissionInfoBarDelegate(requesting_frame,
31 content::PermissionType::GEOLOCATION, 31 content::PermissionType::GEOLOCATION,
32 CONTENT_SETTINGS_TYPE_GEOLOCATION,
33 user_gesture, 32 user_gesture,
34 profile, 33 profile,
35 callback) {} 34 callback) {}
36 35
37 GeolocationInfoBarDelegateAndroid::~GeolocationInfoBarDelegateAndroid() {} 36 GeolocationInfoBarDelegateAndroid::~GeolocationInfoBarDelegateAndroid() {}
38 37
39 infobars::InfoBarDelegate::InfoBarIdentifier 38 infobars::InfoBarDelegate::InfoBarIdentifier
40 GeolocationInfoBarDelegateAndroid::GetIdentifier() const { 39 GeolocationInfoBarDelegateAndroid::GetIdentifier() const {
41 return GEOLOCATION_INFOBAR_DELEGATE_ANDROID; 40 return GEOLOCATION_INFOBAR_DELEGATE_ANDROID;
42 } 41 }
43 42
44 int GeolocationInfoBarDelegateAndroid::GetIconId() const { 43 int GeolocationInfoBarDelegateAndroid::GetIconId() const {
45 return IDR_ANDROID_INFOBAR_GEOLOCATION; 44 return IDR_ANDROID_INFOBAR_GEOLOCATION;
46 } 45 }
47 46
48 int GeolocationInfoBarDelegateAndroid::GetMessageResourceId() const { 47 int GeolocationInfoBarDelegateAndroid::GetMessageResourceId() const {
49 return IDS_GEOLOCATION_INFOBAR_QUESTION; 48 return IDS_GEOLOCATION_INFOBAR_QUESTION;
50 } 49 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698