chrome/browser/geolocation/geolocation_infobar_delegate_android.h - Issue 23345004: Fix Android strict-mode violation in GeoLocation info bar.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/geolocation/geolocation_infobar_delegate_android.h

Issue 23345004: Fix Android strict-mode violation in GeoLocation info bar. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rewrite Created 6 years, 10 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/geolocation/geolocation_infobar_delegate.cc ('K') | « chrome/browser/geolocation/geolocation_infobar_delegate.cc ('k') | chrome/browser/geolocation/geolocation_infobar_delegate_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/geolocation/geolocation_infobar_delegate_android.h

diff --git a/chrome/browser/geolocation/geolocation_infobar_delegate_android.h b/chrome/browser/geolocation/geolocation_infobar_delegate_android.h

index 3365656c4317acb1678b5067600010b6273a3330..f6d6ecb0cd00a705b59adc7084c7c702bead70b9 100644

--- a/chrome/browser/geolocation/geolocation_infobar_delegate_android.h

+++ b/chrome/browser/geolocation/geolocation_infobar_delegate_android.h

@@ -17,7 +17,8 @@ class GeolocationInfoBarDelegateAndroid : public GeolocationInfoBarDelegate {

const PermissionRequestID& id,

const GURL& requesting_frame_url,

int contents_unique_id,

- const std::string& display_languages);

+ const std::string& display_languages,

+ const std::string accept_button_label);

bulach 2014/02/14 11:36:48 nit: &

acleung1 2014/02/21 21:18:01 Done.

private:

virtual ~GeolocationInfoBarDelegateAndroid();

@@ -28,6 +29,8 @@ class GeolocationInfoBarDelegateAndroid : public GeolocationInfoBarDelegate {

scoped_ptr<GoogleLocationSettingsHelper> google_location_settings_helper_;

+ std::string accept_button_label_;

DISALLOW_COPY_AND_ASSIGN(GeolocationInfoBarDelegateAndroid);

};