Commit 1acdfe3c authored by Sylvain Defresne's avatar Sylvain Defresne Committed by Commit Bot

[ios] Fix uses of ios::ChromeBrowserState in /ios/chrome/browser/share_extension

The ChromeBrowserState has been moved from the "ios" namespace
to the global namespace by http://crrev.com/c/2014913. Fix the
uses from ios::ChromeBrowserState to ChromeBrowserState.

Also remove includes of chrome_browser_state_forward.h and use
a simple forward declaration instead (since the old name is no
longer necessary).

This CL was uploaded by git cl split.

R=olivierrobin@chromium.org

Bug: 1042208
Change-Id: I8681d8f472f14a1dbc22e680b236581e02093c45
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2017503Reviewed-by: default avatarOlivier Robin <olivierrobin@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#735358}
parent 85445c99
......@@ -10,18 +10,18 @@
#include "base/macros.h"
#include "base/no_destructor.h"
#include "components/keyed_service/ios/browser_state_keyed_service_factory.h"
#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
class ChromeBrowserState;
class ShareExtensionService;
// Singleton that creates the ShareExtensionService and associates that service
// with ios::ChromeBrowserState.
// with ChromeBrowserState.
class ShareExtensionServiceFactory : public BrowserStateKeyedServiceFactory {
public:
static ShareExtensionService* GetForBrowserState(
ios::ChromeBrowserState* browser_state);
ChromeBrowserState* browser_state);
static ShareExtensionService* GetForBrowserStateIfExists(
ios::ChromeBrowserState* browser_state);
ChromeBrowserState* browser_state);
static ShareExtensionServiceFactory* GetInstance();
private:
......
......@@ -18,14 +18,14 @@
// static
ShareExtensionService* ShareExtensionServiceFactory::GetForBrowserState(
ios::ChromeBrowserState* browser_state) {
ChromeBrowserState* browser_state) {
return static_cast<ShareExtensionService*>(
GetInstance()->GetServiceForBrowserState(browser_state, true));
}
// static
ShareExtensionService* ShareExtensionServiceFactory::GetForBrowserStateIfExists(
ios::ChromeBrowserState* browser_state) {
ChromeBrowserState* browser_state) {
return static_cast<ShareExtensionService*>(
GetInstance()->GetServiceForBrowserState(browser_state, false));
}
......@@ -49,8 +49,8 @@ ShareExtensionServiceFactory::~ShareExtensionServiceFactory() {}
std::unique_ptr<KeyedService>
ShareExtensionServiceFactory::BuildServiceInstanceFor(
web::BrowserState* context) const {
ios::ChromeBrowserState* chrome_browser_state =
ios::ChromeBrowserState::FromBrowserState(context);
ChromeBrowserState* chrome_browser_state =
ChromeBrowserState::FromBrowserState(context);
return std::make_unique<ShareExtensionService>(
ios::BookmarkModelFactory::GetForBrowserState(chrome_browser_state),
ReadingListModelFactory::GetForBrowserState(chrome_browser_state));
......
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