| Index: chrome/browser/android/google_location_settings_helper.cc
|
| diff --git a/chrome/browser/android/google_location_settings_helper.cc b/chrome/browser/android/google_location_settings_helper.cc
|
| deleted file mode 100644
|
| index 3dc8e004a75ea604f61b6942d695f27277fc0b2a..0000000000000000000000000000000000000000
|
| --- a/chrome/browser/android/google_location_settings_helper.cc
|
| +++ /dev/null
|
| @@ -1,31 +0,0 @@
|
| -// Copyright 2014 The Chromium Authors. All rights reserved.
|
| -// Use of this source code is governed by a BSD-style license that can be
|
| -// found in the LICENSE file.
|
| -
|
| -#include "chrome/browser/android/google_location_settings_helper.h"
|
| -
|
| -// Temporary stubs for a 3 way patch
|
| -
|
| -std::string GoogleLocationSettingsHelper::GetAcceptButtonLabel(bool allow) {
|
| - return std::string();
|
| -}
|
| -
|
| -bool GoogleLocationSettingsHelper::IsAllowLabel() {
|
| - return false;
|
| -}
|
| -
|
| -void GoogleLocationSettingsHelper::ShowGoogleLocationSettings() {
|
| -}
|
| -
|
| -bool GoogleLocationSettingsHelper::IsMasterLocationSettingEnabled() {
|
| - return false;
|
| -}
|
| -
|
| -bool GoogleLocationSettingsHelper::IsGoogleAppsLocationSettingEnabled() {
|
| - return false;
|
| -}
|
| -
|
| -bool GoogleLocationSettingsHelper::IsSystemLocationEnabled() {
|
| - return IsMasterLocationSettingEnabled() &&
|
| - IsGoogleAppsLocationSettingEnabled();
|
| -}
|
|
|