diff options
author | sdefresne <sdefresne@chromium.org> | 2016-01-13 09:36:26 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-01-13 17:38:13 +0000 |
commit | ddf93072f4459f4e0aa350db40996b0165ade89b (patch) | |
tree | a5baf4ec2d2259f7f43d068f25865666e6249496 | |
parent | 1971ca662433fe09e5f00ca140e1f81748786f34 (diff) | |
download | chromium_src-ddf93072f4459f4e0aa350db40996b0165ade89b.zip chromium_src-ddf93072f4459f4e0aa350db40996b0165ade89b.tar.gz chromium_src-ddf93072f4459f4e0aa350db40996b0165ade89b.tar.bz2 |
Remove obsolete class StringProvider.
BUG=None
Review URL: https://codereview.chromium.org/1584793002
Cr-Commit-Position: refs/heads/master@{#369202}
7 files changed, 0 insertions, 69 deletions
diff --git a/ios/provider/ios_provider_chrome.gyp b/ios/provider/ios_provider_chrome.gyp index dc2bb81..d11ac59 100644 --- a/ios/provider/ios_provider_chrome.gyp +++ b/ios/provider/ios_provider_chrome.gyp @@ -28,8 +28,6 @@ '../public/provider/chrome/browser/signin/signin_error_provider.mm', '../public/provider/chrome/browser/signin/signin_resources_provider.h', '../public/provider/chrome/browser/signin/signin_resources_provider.mm', - '../public/provider/chrome/browser/string_provider.cc', - '../public/provider/chrome/browser/string_provider.h', '../public/provider/chrome/browser/ui/infobar_view_delegate.h', '../public/provider/chrome/browser/ui/infobar_view_protocol.h', '../public/provider/chrome/browser/updatable_resource_provider.h', diff --git a/ios/public/provider/chrome/browser/chrome_browser_provider.cc b/ios/public/provider/chrome/browser/chrome_browser_provider.cc index c243206..277c0dc 100644 --- a/ios/public/provider/chrome/browser/chrome_browser_provider.cc +++ b/ios/public/provider/chrome/browser/chrome_browser_provider.cc @@ -65,10 +65,6 @@ ChromeIdentityService* ChromeBrowserProvider::GetChromeIdentityService() { return nullptr; } -StringProvider* ChromeBrowserProvider::GetStringProvider() { - return nullptr; -} - LiveTabContextProvider* ChromeBrowserProvider::GetLiveTabContextProvider() { return nullptr; } diff --git a/ios/public/provider/chrome/browser/chrome_browser_provider.h b/ios/public/provider/chrome/browser/chrome_browser_provider.h index 86df29a..d008782 100644 --- a/ios/public/provider/chrome/browser/chrome_browser_provider.h +++ b/ios/public/provider/chrome/browser/chrome_browser_provider.h @@ -59,7 +59,6 @@ class ChromeBrowserStateManager; class ChromeIdentityService; class GeolocationUpdaterProvider; class SigninResourcesProvider; -class StringProvider; class LiveTabContextProvider; class UpdatableResourceProvider; @@ -97,8 +96,6 @@ class ChromeBrowserProvider { virtual SigninResourcesProvider* GetSigninResourcesProvider(); // Returns an instance of a Chrome identity service. virtual ChromeIdentityService* GetChromeIdentityService(); - // Returns an instance of a string provider. - virtual StringProvider* GetStringProvider(); // Returns an instance of a LiveTabContextProvider. virtual LiveTabContextProvider* GetLiveTabContextProvider(); virtual GeolocationUpdaterProvider* GetGeolocationUpdaterProvider(); diff --git a/ios/public/provider/chrome/browser/string_provider.cc b/ios/public/provider/chrome/browser/string_provider.cc deleted file mode 100644 index 3e9bdd6..0000000 --- a/ios/public/provider/chrome/browser/string_provider.cc +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright 2016 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 "ios/public/provider/chrome/browser/string_provider.h" - -namespace ios { - -StringProvider::StringProvider() {} - -StringProvider::~StringProvider() {} - -base::string16 StringProvider::GetProductName() { - return base::string16(); -} - -} // namespace ios diff --git a/ios/public/provider/chrome/browser/string_provider.h b/ios/public/provider/chrome/browser/string_provider.h deleted file mode 100644 index 2939c9c3..0000000 --- a/ios/public/provider/chrome/browser/string_provider.h +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright 2013 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. - -#ifndef IOS_PUBLIC_PROVIDER_CHROME_BROWSER_STRING_PROVIDER_H_ -#define IOS_PUBLIC_PROVIDER_CHROME_BROWSER_STRING_PROVIDER_H_ - -#include <string> - -#include "base/strings/string16.h" - -namespace ios { - -// A class that provides access to localized strings defined in -// src/ios_internal/ from code that lives in src/chrome/browser/ but has not -// been moved upstream yet. -// -// Situations where forked code needs access to downstream strings should be -// temporary and methods should be removed when either -// 1) the code is moved to upstream (in which case the strings should also be -// moved to upstream into src/grit/generated_resources.grd), or -// 2) the downstream implementation changes to match upstream so the string -// is no longer necessary. -class StringProvider { - public: - StringProvider(); - virtual ~StringProvider(); - - // Returns the product name (e.g. "Google Chrome"). - virtual base::string16 GetProductName(); -}; - -} // namespace ios - -#endif // IOS_PUBLIC_PROVIDER_CHROME_BROWSER_STRING_PROVIDER_H_ diff --git a/ios/public/test/test_chrome_browser_provider.h b/ios/public/test/test_chrome_browser_provider.h index 11776d1..18883dd 100644 --- a/ios/public/test/test_chrome_browser_provider.h +++ b/ios/public/test/test_chrome_browser_provider.h @@ -28,13 +28,11 @@ class TestChromeBrowserProvider : public ChromeBrowserProvider { GetProfileOAuth2TokenServiceIOSProvider() override; ChromeIdentityService* GetChromeIdentityService() override; UpdatableResourceProvider* GetUpdatableResourceProvider() override; - StringProvider* GetStringProvider() override; private: scoped_ptr<FakeProfileOAuth2TokenServiceIOSProvider> oauth2_token_service_provider_; scoped_ptr<ChromeIdentityService> chrome_identity_service_; - scoped_ptr<StringProvider> string_provider_; scoped_ptr<TestUpdatableResourceProvider> test_updatable_resource_provider_; DISALLOW_COPY_AND_ASSIGN(TestChromeBrowserProvider); diff --git a/ios/public/test/test_chrome_browser_provider.mm b/ios/public/test/test_chrome_browser_provider.mm index 6c9da02..5220024 100644 --- a/ios/public/test/test_chrome_browser_provider.mm +++ b/ios/public/test/test_chrome_browser_provider.mm @@ -7,7 +7,6 @@ #include "base/logging.h" #include "components/signin/ios/browser/fake_profile_oauth2_token_service_ios_provider.h" #include "ios/public/provider/chrome/browser/signin/chrome_identity_service.h" -#include "ios/public/provider/chrome/browser/string_provider.h" #import "ios/public/test/test_updatable_resource_provider.h" namespace ios { @@ -16,7 +15,6 @@ TestChromeBrowserProvider::TestChromeBrowserProvider() : oauth2_token_service_provider_( new FakeProfileOAuth2TokenServiceIOSProvider), chrome_identity_service_(new ios::ChromeIdentityService), - string_provider_(new StringProvider), test_updatable_resource_provider_(new TestUpdatableResourceProvider) {} TestChromeBrowserProvider::~TestChromeBrowserProvider() { @@ -38,10 +36,6 @@ ChromeIdentityService* TestChromeBrowserProvider::GetChromeIdentityService() { return chrome_identity_service_.get(); } -StringProvider* TestChromeBrowserProvider::GetStringProvider() { - return string_provider_.get(); -} - UpdatableResourceProvider* TestChromeBrowserProvider::GetUpdatableResourceProvider() { return test_updatable_resource_provider_.get(); |