chrome/browser/android/mock_google_location_settings_helper.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/android/mock_google_location_settings_helper.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: address comments / fix tests 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

« no previous file with comments | « chrome/browser/android/google_location_settings_helper.h ('k') | chrome/browser/android/mock_google_location_settings_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/android/mock_google_location_settings_helper.h

diff --git a/chrome/browser/android/mock_google_location_settings_helper.h b/chrome/browser/android/mock_google_location_settings_helper.h

index 328f2a9f6e2cc6bbd664b51ccff118afade4a92d..64bea2f3262038bac775fa01510803859d7a9b36 100644

--- a/chrome/browser/android/mock_google_location_settings_helper.h

+++ b/chrome/browser/android/mock_google_location_settings_helper.h

@@ -14,10 +14,11 @@ class MockGoogleLocationSettingsHelper : public GoogleLocationSettingsHelper {

static bool WasGoogleLocationSettingsCalled();

// GoogleLocationSettingsHelper implementation:

- virtual std::string GetAcceptButtonLabel() OVERRIDE;

+ virtual std::string GetAcceptButtonLabel(bool allow) OVERRIDE;

virtual void ShowGoogleLocationSettings() OVERRIDE;

virtual bool IsMasterLocationSettingEnabled() OVERRIDE;

virtual bool IsGoogleAppsLocationSettingEnabled() OVERRIDE;

+ virtual bool IsAllowLabel() OVERRIDE;

protected:

MockGoogleLocationSettingsHelper();