diff options
author | droger <droger@chromium.org> | 2015-04-22 02:05:34 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-04-22 09:05:53 +0000 |
commit | 46ee31101c3943d03864ad0eebf28582e3d9ec78 (patch) | |
tree | 01c7178f1a33b229af35147b36b535d098bbb3a1 /ios | |
parent | df9c7fd3c4ba0f43fa27df0bbca0089e8cb94b01 (diff) | |
download | chromium_src-46ee31101c3943d03864ad0eebf28582e3d9ec78.zip chromium_src-46ee31101c3943d03864ad0eebf28582e3d9ec78.tar.gz chromium_src-46ee31101c3943d03864ad0eebf28582e3d9ec78.tar.bz2 |
Remove the provider API for InfobarManager
This CL removes the provider API, as the InfobarManager can now be used
on iOS.
Review URL: https://codereview.chromium.org/1093423002
Cr-Commit-Position: refs/heads/master@{#326251}
Diffstat (limited to 'ios')
3 files changed, 2 insertions, 13 deletions
diff --git a/ios/chrome/browser/translate/chrome_ios_translate_client.mm b/ios/chrome/browser/translate/chrome_ios_translate_client.mm index 7054005..a4d0c27 100644 --- a/ios/chrome/browser/translate/chrome_ios_translate_client.mm +++ b/ios/chrome/browser/translate/chrome_ios_translate_client.mm @@ -17,6 +17,7 @@ #include "components/translate/core/browser/translate_step.h" #include "ios/chrome/browser/infobars/infobar.h" #include "ios/chrome/browser/infobars/infobar_controller.h" +#include "ios/chrome/browser/infobars/infobar_manager_impl.h" #include "ios/chrome/browser/pref_names.h" #import "ios/chrome/browser/translate/after_translate_infobar_controller.h" #import "ios/chrome/browser/translate/before_translate_infobar_controller.h" @@ -26,7 +27,6 @@ #include "ios/chrome/browser/translate/translate_service_ios.h" #include "ios/chrome/grit/ios_theme_resources.h" #include "ios/public/provider/chrome/browser/browser_state/chrome_browser_state.h" -#include "ios/public/provider/chrome/browser/chrome_browser_provider.h" #include "ios/web/public/browser_state.h" #include "ios/web/public/web_state/web_state.h" #include "url/gurl.h" @@ -103,7 +103,7 @@ void ChromeIOSTranslateClient::ShowTranslateUI( translate::TranslateInfoBarDelegate::Create( step != translate::TRANSLATE_STEP_BEFORE_TRANSLATE, translate_manager_->GetWeakPtr(), - ios::GetChromeBrowserProvider()->GetInfoBarManager(web_state()), + InfoBarManagerImpl::FromWebState(web_state()), web_state()->GetBrowserState()->IsOffTheRecord(), step, source_language, target_language, error_type, triggered_from_menu); } diff --git a/ios/public/provider/chrome/browser/chrome_browser_provider.cc b/ios/public/provider/chrome/browser/chrome_browser_provider.cc index 72a700f..25d98fd 100644 --- a/ios/public/provider/chrome/browser/chrome_browser_provider.cc +++ b/ios/public/provider/chrome/browser/chrome_browser_provider.cc @@ -39,11 +39,6 @@ InfoBarViewPlaceholder* ChromeBrowserProvider::CreateInfoBarView() { return nullptr; } -infobars::InfoBarManager* ChromeBrowserProvider::GetInfoBarManager( - web::WebState* web_state) { - return nullptr; -} - StringProvider* ChromeBrowserProvider::GetStringProvider() { 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 99a7b6e..bf7a1fe 100644 --- a/ios/public/provider/chrome/browser/chrome_browser_provider.h +++ b/ios/public/provider/chrome/browser/chrome_browser_provider.h @@ -7,10 +7,6 @@ class PrefService; -namespace infobars { -class InfoBarManager; -} - namespace net { class URLRequestContextGetter; } @@ -54,8 +50,6 @@ class ChromeBrowserProvider { // Returns an instance of an infobar view. The caller is responsible for // initializing the returned object and releasing it when appropriate. virtual InfoBarViewPlaceholder* CreateInfoBarView(); - // Gets the infobar manager associated with |web_state|. - virtual infobars::InfoBarManager* GetInfoBarManager(web::WebState* web_state); // Returns an instance of a string provider. virtual StringProvider* GetStringProvider(); // Displays the Translate settings screen. |