Commit 35b4e3b4 authored by Sylvain Defresne's avatar Sylvain Defresne Committed by Commit Bot

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

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=pkl@chromium.org

Bug: 1042208
Change-Id: Ic847e54a737366f05842c7b471cee614129d0daa
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2014974Reviewed-by: default avatarPeter Lee <pkl@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#735272}
parent f7d61b33
...@@ -125,7 +125,7 @@ NSString* const kActivityServicesSnackbarCategory = ...@@ -125,7 +125,7 @@ NSString* const kActivityServicesSnackbarCategory =
} }
- (void)shareWithData:(ShareToData*)data - (void)shareWithData:(ShareToData*)data
browserState:(ios::ChromeBrowserState*)browserState browserState:(ChromeBrowserState*)browserState
dispatcher:(id<BrowserCommands, SnackbarCommands>)dispatcher dispatcher:(id<BrowserCommands, SnackbarCommands>)dispatcher
passwordProvider:(id<ActivityServicePassword>)passwordProvider passwordProvider:(id<ActivityServicePassword>)passwordProvider
positionProvider:(id<ActivityServicePositioner>)positionProvider positionProvider:(id<ActivityServicePositioner>)positionProvider
......
...@@ -5,11 +5,11 @@ ...@@ -5,11 +5,11 @@
#ifndef IOS_CHROME_BROWSER_UI_ACTIVITY_SERVICES_ACTIVITY_SERVICE_LEGACY_COORDINATOR_H_ #ifndef IOS_CHROME_BROWSER_UI_ACTIVITY_SERVICES_ACTIVITY_SERVICE_LEGACY_COORDINATOR_H_
#define IOS_CHROME_BROWSER_UI_ACTIVITY_SERVICES_ACTIVITY_SERVICE_LEGACY_COORDINATOR_H_ #define IOS_CHROME_BROWSER_UI_ACTIVITY_SERVICES_ACTIVITY_SERVICE_LEGACY_COORDINATOR_H_
#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
#import "ios/chrome/browser/ui/coordinators/chrome_coordinator.h" #import "ios/chrome/browser/ui/coordinators/chrome_coordinator.h"
@protocol ActivityServicePositioner; @protocol ActivityServicePositioner;
@protocol ActivityServicePresentation; @protocol ActivityServicePresentation;
class ChromeBrowserState;
@class CommandDispatcher; @class CommandDispatcher;
@class TabModel; @class TabModel;
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
@interface ActivityServiceLegacyCoordinator : ChromeCoordinator @interface ActivityServiceLegacyCoordinator : ChromeCoordinator
// Models. // Models.
@property(nonatomic, readwrite, assign) ios::ChromeBrowserState* browserState; @property(nonatomic, readwrite, assign) ChromeBrowserState* browserState;
@property(nonatomic, readwrite, weak) CommandDispatcher* dispatcher; @property(nonatomic, readwrite, weak) CommandDispatcher* dispatcher;
@property(nonatomic, readwrite, weak) TabModel* tabModel; @property(nonatomic, readwrite, weak) TabModel* tabModel;
......
...@@ -8,12 +8,12 @@ ...@@ -8,12 +8,12 @@
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
@protocol ActivityServicePassword; @protocol ActivityServicePassword;
@protocol ActivityServicePositioner; @protocol ActivityServicePositioner;
@protocol ActivityServicePresentation; @protocol ActivityServicePresentation;
@protocol BrowserCommands; @protocol BrowserCommands;
class ChromeBrowserState;
@class ShareToData; @class ShareToData;
@protocol SnackbarCommands; @protocol SnackbarCommands;
...@@ -48,7 +48,7 @@ enum ShareResult { ...@@ -48,7 +48,7 @@ enum ShareResult {
// Shares the given data. The given providers must not be nil. On iPad, the // Shares the given data. The given providers must not be nil. On iPad, the
// |positionProvider| must return a non-nil view and a non-zero size. // |positionProvider| must return a non-nil view and a non-zero size.
- (void)shareWithData:(ShareToData*)data - (void)shareWithData:(ShareToData*)data
browserState:(ios::ChromeBrowserState*)browserState browserState:(ChromeBrowserState*)browserState
dispatcher:(id<BrowserCommands, SnackbarCommands>)dispatcher dispatcher:(id<BrowserCommands, SnackbarCommands>)dispatcher
passwordProvider:(id<ActivityServicePassword>)passwordProvider passwordProvider:(id<ActivityServicePassword>)passwordProvider
positionProvider:(id<ActivityServicePositioner>)positionProvider positionProvider:(id<ActivityServicePositioner>)positionProvider
......
...@@ -77,7 +77,7 @@ class ShareToDataBuilderTest : public PlatformTest { ...@@ -77,7 +77,7 @@ class ShareToDataBuilderTest : public PlatformTest {
private: private:
FakeSnapshotGeneratorDelegate* delegate_ = nil; FakeSnapshotGeneratorDelegate* delegate_ = nil;
web::WebTaskEnvironment task_environment_; web::WebTaskEnvironment task_environment_;
std::unique_ptr<ios::ChromeBrowserState> chrome_browser_state_; std::unique_ptr<ChromeBrowserState> chrome_browser_state_;
std::unique_ptr<web::TestWebState> web_state_; std::unique_ptr<web::TestWebState> web_state_;
DISALLOW_COPY_AND_ASSIGN(ShareToDataBuilderTest); DISALLOW_COPY_AND_ASSIGN(ShareToDataBuilderTest);
......
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