Commit da2e37af authored by John Z Wu's avatar John Z Wu Committed by Commit Bot

Make WebViewSigninClientFactory return a IOSWebviewSigninClient.

It used to return a pointer to the base class SigninClient. Since this
is a factory specific for //ios/web_view, it makes sense to return the
//ios/web_view specific subclass.

Bug: 
Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: I27d726d7dab7e5ef2193928a2ffd0796cee0351c
Reviewed-on: https://chromium-review.googlesource.com/744738Reviewed-by: default avatarHiroshi Ichikawa <ichikawa@chromium.org>
Reviewed-by: default avatarEugene But <eugenebut@chromium.org>
Commit-Queue: John Wu <jzw@chromium.org>
Cr-Commit-Position: refs/heads/master@{#513169}
parent 1e726976
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include "components/keyed_service/ios/browser_state_dependency_manager.h" #include "components/keyed_service/ios/browser_state_dependency_manager.h"
#include "components/signin/core/browser/account_fetcher_service.h" #include "components/signin/core/browser/account_fetcher_service.h"
#include "components/signin/core/browser/profile_oauth2_token_service.h" #include "components/signin/core/browser/profile_oauth2_token_service.h"
#include "ios/web_view/internal/signin/ios_web_view_signin_client.h"
#include "ios/web_view/internal/signin/web_view_account_tracker_service_factory.h" #include "ios/web_view/internal/signin/web_view_account_tracker_service_factory.h"
#include "ios/web_view/internal/signin/web_view_oauth2_token_service_factory.h" #include "ios/web_view/internal/signin/web_view_oauth2_token_service_factory.h"
#include "ios/web_view/internal/signin/web_view_signin_client_factory.h" #include "ios/web_view/internal/signin/web_view_signin_client_factory.h"
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include "base/memory/singleton.h" #include "base/memory/singleton.h"
#include "components/keyed_service/ios/browser_state_dependency_manager.h" #include "components/keyed_service/ios/browser_state_dependency_manager.h"
#include "components/signin/core/browser/account_tracker_service.h" #include "components/signin/core/browser/account_tracker_service.h"
#include "ios/web_view/internal/signin/ios_web_view_signin_client.h"
#include "ios/web_view/internal/signin/web_view_signin_client_factory.h" #include "ios/web_view/internal/signin/web_view_signin_client_factory.h"
#include "ios/web_view/internal/web_view_browser_state.h" #include "ios/web_view/internal/web_view_browser_state.h"
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include "components/signin/core/browser/gaia_cookie_manager_service.h" #include "components/signin/core/browser/gaia_cookie_manager_service.h"
#include "components/signin/core/browser/profile_oauth2_token_service.h" #include "components/signin/core/browser/profile_oauth2_token_service.h"
#include "google_apis/gaia/gaia_constants.h" #include "google_apis/gaia/gaia_constants.h"
#include "ios/web_view/internal/signin/ios_web_view_signin_client.h"
#include "ios/web_view/internal/signin/web_view_oauth2_token_service_factory.h" #include "ios/web_view/internal/signin/web_view_oauth2_token_service_factory.h"
#include "ios/web_view/internal/signin/web_view_signin_client_factory.h" #include "ios/web_view/internal/signin/web_view_signin_client_factory.h"
#include "ios/web_view/internal/web_view_browser_state.h" #include "ios/web_view/internal/web_view_browser_state.h"
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include "components/signin/core/browser/profile_oauth2_token_service.h" #include "components/signin/core/browser/profile_oauth2_token_service.h"
#include "components/signin/ios/browser/profile_oauth2_token_service_ios_delegate.h" #include "components/signin/ios/browser/profile_oauth2_token_service_ios_delegate.h"
#import "ios/web_view/internal/cwv_web_view_configuration_internal.h" #import "ios/web_view/internal/cwv_web_view_configuration_internal.h"
#include "ios/web_view/internal/signin/ios_web_view_signin_client.h"
#include "ios/web_view/internal/signin/web_view_account_tracker_service_factory.h" #include "ios/web_view/internal/signin/web_view_account_tracker_service_factory.h"
#include "ios/web_view/internal/signin/web_view_profile_oauth2_token_service_ios_provider_impl.h" #include "ios/web_view/internal/signin/web_view_profile_oauth2_token_service_ios_provider_impl.h"
#include "ios/web_view/internal/signin/web_view_signin_client_factory.h" #include "ios/web_view/internal/signin/web_view_signin_client_factory.h"
......
...@@ -18,9 +18,9 @@ ...@@ -18,9 +18,9 @@
namespace ios_web_view { namespace ios_web_view {
// static // static
SigninClient* WebViewSigninClientFactory::GetForBrowserState( IOSWebViewSigninClient* WebViewSigninClientFactory::GetForBrowserState(
ios_web_view::WebViewBrowserState* browser_state) { ios_web_view::WebViewBrowserState* browser_state) {
return static_cast<SigninClient*>( return static_cast<IOSWebViewSigninClient*>(
GetInstance()->GetServiceForBrowserState(browser_state, true)); GetInstance()->GetServiceForBrowserState(browser_state, true));
} }
......
...@@ -15,7 +15,7 @@ template <typename T> ...@@ -15,7 +15,7 @@ template <typename T>
struct DefaultSingletonTraits; struct DefaultSingletonTraits;
} // namespace base } // namespace base
class SigninClient; class IOSWebViewSigninClient;
namespace ios_web_view { namespace ios_web_view {
class WebViewBrowserState; class WebViewBrowserState;
...@@ -24,7 +24,7 @@ class WebViewBrowserState; ...@@ -24,7 +24,7 @@ class WebViewBrowserState;
// a browser state. // a browser state.
class WebViewSigninClientFactory : public BrowserStateKeyedServiceFactory { class WebViewSigninClientFactory : public BrowserStateKeyedServiceFactory {
public: public:
static SigninClient* GetForBrowserState( static IOSWebViewSigninClient* GetForBrowserState(
ios_web_view::WebViewBrowserState* browser_state); ios_web_view::WebViewBrowserState* browser_state);
static WebViewSigninClientFactory* GetInstance(); static WebViewSigninClientFactory* GetInstance();
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include "components/signin/core/browser/signin_manager.h" #include "components/signin/core/browser/signin_manager.h"
#include "components/signin/core/browser/signin_pref_names.h" #include "components/signin/core/browser/signin_pref_names.h"
#include "ios/web_view/internal/app/application_context.h" #include "ios/web_view/internal/app/application_context.h"
#include "ios/web_view/internal/signin/ios_web_view_signin_client.h"
#include "ios/web_view/internal/signin/web_view_account_tracker_service_factory.h" #include "ios/web_view/internal/signin/web_view_account_tracker_service_factory.h"
#include "ios/web_view/internal/signin/web_view_gaia_cookie_manager_service_factory.h" #include "ios/web_view/internal/signin/web_view_gaia_cookie_manager_service_factory.h"
#include "ios/web_view/internal/signin/web_view_oauth2_token_service_factory.h" #include "ios/web_view/internal/signin/web_view_oauth2_token_service_factory.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment