Commit 8ab84793 authored by Sylvain Defresne's avatar Sylvain Defresne Committed by Commit Bot

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

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

Bug: 1042208
Change-Id: Ieae5c6ac2742659716e71514c178ea9a9d02c269
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2017462Reviewed-by: default avatarJavier Ernesto Flores Robles <javierrobles@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#734966}
parent 23362160
...@@ -45,8 +45,7 @@ ...@@ -45,8 +45,7 @@
// Unavailable, use -initWithBaseViewController:browser:injectionHandler:. // Unavailable, use -initWithBaseViewController:browser:injectionHandler:.
- (instancetype)initWithBaseViewController:(UIViewController*)viewController - (instancetype)initWithBaseViewController:(UIViewController*)viewController
browserState: browserState:(ChromeBrowserState*)browserState
(ios::ChromeBrowserState*)browserState
NS_UNAVAILABLE; NS_UNAVAILABLE;
- (instancetype)initWithBaseViewController:(UIViewController*)viewController - (instancetype)initWithBaseViewController:(UIViewController*)viewController
browser:(Browser*)browser NS_UNAVAILABLE; browser:(Browser*)browser NS_UNAVAILABLE;
......
...@@ -14,7 +14,8 @@ ...@@ -14,7 +14,8 @@
#include "components/autofill/core/browser/autofill_client.h" #include "components/autofill/core/browser/autofill_client.h"
#include "components/autofill/core/browser/payments/full_card_request.h" #include "components/autofill/core/browser/payments/full_card_request.h"
#include "components/autofill/core/browser/ui/payments/card_unmask_prompt_controller_impl.h" #include "components/autofill/core/browser/ui/payments/card_unmask_prompt_controller_impl.h"
#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
class ChromeBrowserState;
namespace autofill { namespace autofill {
class AutofillManager; class AutofillManager;
...@@ -27,7 +28,7 @@ class FullCardRequester ...@@ -27,7 +28,7 @@ class FullCardRequester
public base::SupportsWeakPtr<FullCardRequester> { public base::SupportsWeakPtr<FullCardRequester> {
public: public:
FullCardRequester(UIViewController* base_view_controller, FullCardRequester(UIViewController* base_view_controller,
ios::ChromeBrowserState* browser_state); ChromeBrowserState* browser_state);
void GetFullCard( void GetFullCard(
const autofill::CreditCard& card, const autofill::CreditCard& card,
......
...@@ -24,7 +24,7 @@ autofill::CardUnmaskPromptView* CreateCardUnmaskPromptViewBridge( ...@@ -24,7 +24,7 @@ autofill::CardUnmaskPromptView* CreateCardUnmaskPromptViewBridge(
} }
FullCardRequester::FullCardRequester(UIViewController* base_view_controller, FullCardRequester::FullCardRequester(UIViewController* base_view_controller,
ios::ChromeBrowserState* browser_state) ChromeBrowserState* browser_state)
: base_view_controller_(base_view_controller), : base_view_controller_(base_view_controller),
unmask_controller_(browser_state->GetPrefs(), unmask_controller_(browser_state->GetPrefs(),
browser_state->IsOffTheRecord()) {} browser_state->IsOffTheRecord()) {}
......
...@@ -8,12 +8,12 @@ ...@@ -8,12 +8,12 @@
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#include "base/memory/ref_counted.h" #include "base/memory/ref_counted.h"
#include "ios/chrome/browser/browser_state/chrome_browser_state_forward.h"
namespace autofill { namespace autofill {
class CreditCard; class CreditCard;
} // namespace autofill } // namespace autofill
class ChromeBrowserState;
class WebStateList; class WebStateList;
@protocol FullCardRequestResultDelegateObserving; @protocol FullCardRequestResultDelegateObserving;
...@@ -24,7 +24,7 @@ class WebStateList; ...@@ -24,7 +24,7 @@ class WebStateList;
// Inits the requests with required parameters and the |delegate| to receive the // Inits the requests with required parameters and the |delegate| to receive the
// success/failure state of the request. // success/failure state of the request.
- (instancetype)initWithBrowserState:(ios::ChromeBrowserState*)browserState - (instancetype)initWithBrowserState:(ChromeBrowserState*)browserState
webStateList:(WebStateList*)webStateList webStateList:(WebStateList*)webStateList
resultDelegate: resultDelegate:
(id<FullCardRequestResultDelegateObserving>)delegate; (id<FullCardRequestResultDelegateObserving>)delegate;
......
...@@ -25,8 +25,8 @@ class CreditCard; ...@@ -25,8 +25,8 @@ class CreditCard;
@interface ManualFillFullCardRequester () @interface ManualFillFullCardRequester ()
// The ios::ChromeBrowserState instance passed to the initializer. // The ChromeBrowserState instance passed to the initializer.
@property(nonatomic, readonly) ios::ChromeBrowserState* browserState; @property(nonatomic, readonly) ChromeBrowserState* browserState;
// The WebStateList for this instance. Used to instantiate the child // The WebStateList for this instance. Used to instantiate the child
// coordinators lazily. // coordinators lazily.
...@@ -41,7 +41,7 @@ class CreditCard; ...@@ -41,7 +41,7 @@ class CreditCard;
std::unique_ptr<FullCardRequestResultDelegateBridge> _cardAssistant; std::unique_ptr<FullCardRequestResultDelegateBridge> _cardAssistant;
} }
- (instancetype)initWithBrowserState:(ios::ChromeBrowserState*)browserState - (instancetype)initWithBrowserState:(ChromeBrowserState*)browserState
webStateList:(WebStateList*)webStateList webStateList:(WebStateList*)webStateList
resultDelegate: resultDelegate:
(id<FullCardRequestResultDelegateObserving>)delegate { (id<FullCardRequestResultDelegateObserving>)delegate {
......
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