Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(180)

Unified Diff: ios/web/shell/view_controller.mm

Issue 1901343002: [ios] Do not use private web// API in ios_web_shell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed review comments Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ios/web/shell/DEPS ('k') | ios/web/web_state/web_state.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/web/shell/view_controller.mm
diff --git a/ios/web/shell/view_controller.mm b/ios/web/shell/view_controller.mm
index 1d541061cbf792a066a0c78679b78381d1fd3306..d1eb8980af7c53e212b95beb13664f9b53ebb31a 100644
--- a/ios/web/shell/view_controller.mm
+++ b/ios/web/shell/view_controller.mm
@@ -15,12 +15,12 @@
#include "ios/net/cookies/cookie_store_ios.h"
#import "ios/net/crn_http_protocol_handler.h"
#import "ios/net/empty_nsurlcache.h"
+#import "ios/net/request_tracker.h"
+#import "ios/web/public/navigation_manager.h"
#include "ios/web/public/referrer.h"
#include "ios/web/public/web_state/web_state.h"
#import "ios/web/public/web_state/web_state_delegate_bridge.h"
#import "ios/web/public/web_state/web_state_observer_bridge.h"
-#include "ios/web/shell/shell_browser_state.h"
-#include "ios/web/web_state/web_state_impl.h"
#include "ui/base/page_transition_types.h"
NSString* const kWebShellBackButtonAccessibilityLabel = @"Back";
@@ -33,7 +33,7 @@ using web::NavigationManager;
CRWWebStateObserver,
UITextFieldDelegate> {
web::BrowserState* _browserState;
- std::unique_ptr<web::WebStateImpl> _webState;
+ std::unique_ptr<web::WebState> _webState;
std::unique_ptr<web::WebStateObserverBridge> _webStateObserver;
std::unique_ptr<web::WebStateDelegateBridge> _webStateDelegate;
@@ -111,8 +111,8 @@ using web::NavigationManager;
// Set up the network stack before creating the WebState.
[self setUpNetworkStack];
- _webState.reset(new web::WebStateImpl(_browserState));
- _webState->GetNavigationManagerImpl().InitializeSession(nil, nil, NO, 0);
+ web::WebState::CreateParams webStateCreateParams(_browserState);
+ _webState = web::WebState::Create(webStateCreateParams);
_webState->SetWebUsageEnabled(true);
_webStateObserver.reset(
« no previous file with comments | « ios/web/shell/DEPS ('k') | ios/web/web_state/web_state.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698