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

Side by Side Diff: chrome/android/testshell/testshell_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, 9 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
« no previous file with comments | « no previous file | chrome/android/testshell/testshell_google_location_settings_helper.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef CHROME_ANDROID_TESTSHELL_TESTSHELL_GOOGLE_LOCATION_SETTINGS_HELPER_H_ 5 #ifndef CHROME_ANDROID_TESTSHELL_TESTSHELL_GOOGLE_LOCATION_SETTINGS_HELPER_H_
6 #define CHROME_ANDROID_TESTSHELL_TESTSHELL_GOOGLE_LOCATION_SETTINGS_HELPER_H_ 6 #define CHROME_ANDROID_TESTSHELL_TESTSHELL_GOOGLE_LOCATION_SETTINGS_HELPER_H_
7 7
8 #include "chrome/browser/android/google_location_settings_helper.h" 8 #include "chrome/browser/android/google_location_settings_helper.h"
9 9
10 // Stub implementation of GoogleLocationSettingsHelper for testshell. 10 // Stub implementation of GoogleLocationSettingsHelper for testshell.
11 class TestShellGoogleLocationSettingsHelper 11 class TestShellGoogleLocationSettingsHelper
12 : public GoogleLocationSettingsHelper { 12 : public GoogleLocationSettingsHelper {
13 public: 13 public:
14 // GoogleLocationSettingsHelper implementation: 14 // GoogleLocationSettingsHelper implementation:
15 virtual std::string GetAcceptButtonLabel() OVERRIDE; 15 virtual std::string GetAcceptButtonLabel(bool allow) OVERRIDE;
16 virtual void ShowGoogleLocationSettings() OVERRIDE; 16 virtual void ShowGoogleLocationSettings() OVERRIDE;
17 virtual bool IsMasterLocationSettingEnabled() OVERRIDE; 17 virtual bool IsMasterLocationSettingEnabled() OVERRIDE;
18 virtual bool IsGoogleAppsLocationSettingEnabled() OVERRIDE; 18 virtual bool IsGoogleAppsLocationSettingEnabled() OVERRIDE;
19 virtual bool IsAllowLabel() OVERRIDE;
19 20
20 protected: 21 protected:
21 TestShellGoogleLocationSettingsHelper(); 22 TestShellGoogleLocationSettingsHelper();
22 virtual ~TestShellGoogleLocationSettingsHelper(); 23 virtual ~TestShellGoogleLocationSettingsHelper();
23 24
24 private: 25 private:
25 friend class GoogleLocationSettingsHelper; 26 friend class GoogleLocationSettingsHelper;
26 27
27 DISALLOW_COPY_AND_ASSIGN(TestShellGoogleLocationSettingsHelper); 28 DISALLOW_COPY_AND_ASSIGN(TestShellGoogleLocationSettingsHelper);
28 }; 29 };
29 30
30 #endif // CHROME_ANDROID_TESTSHELL_TESTSHELL_GOOGLE_LOCATION_SETTINGS_HELPER_H_ 31 #endif // CHROME_ANDROID_TESTSHELL_TESTSHELL_GOOGLE_LOCATION_SETTINGS_HELPER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/android/testshell/testshell_google_location_settings_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698