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

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

Issue 1835623002: [ios] Cleaned up ios web shell from UIWebView code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merged with origin/master Created 4 years, 9 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') | no next file » | 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 4bc488efd95a6ebd06ce422a4c488f88cc51c417..98ebd10a3e0da7e746cbbf04b2936a9d5e077e32 100644
--- a/ios/web/shell/view_controller.mm
+++ b/ios/web/shell/view_controller.mm
@@ -15,10 +15,6 @@
#include "ios/net/cookies/cookie_store_ios.h"
#import "ios/net/crn_http_protocol_handler.h"
#import "ios/net/empty_nsurlcache.h"
-#import "ios/web/navigation/crw_session_controller.h"
-#import "ios/web/net/crw_url_verifying_protocol_handler.h"
-#include "ios/web/net/request_tracker_factory_impl.h"
-#import "ios/web/net/web_http_protocol_handler_delegate.h"
#include "ios/web/public/referrer.h"
#import "ios/web/public/web_controller_factory.h"
#include "ios/web/public/web_state/web_state.h"
@@ -37,8 +33,6 @@ using web::NavigationManager;
@interface ViewController ()<CRWWebStateObserver> {
web::BrowserState* _browserState;
base::scoped_nsobject<CRWWebController> _webController;
- scoped_ptr<web::RequestTrackerFactoryImpl> _requestTrackerFactory;
- scoped_ptr<web::WebHTTPProtocolHandlerDelegate> _httpProtocolDelegate;
scoped_ptr<web::WebStateObserverBridge> _webStateObserver;
base::mac::ObjCPropertyReleaser _propertyReleaser_ViewController;
@@ -144,21 +138,6 @@ using web::NavigationManager;
- (void)setUpNetworkStack {
// Disable the default cache.
[NSURLCache setSharedURLCache:[EmptyNSURLCache emptyNSURLCache]];
-
- _httpProtocolDelegate.reset(new web::WebHTTPProtocolHandlerDelegate(
- _browserState->GetRequestContext()));
- net::HTTPProtocolHandlerDelegate::SetInstance(_httpProtocolDelegate.get());
- BOOL success = [NSURLProtocol registerClass:[CRNHTTPProtocolHandler class]];
- DCHECK(success);
- // The CRWURLVerifyingProtocolHandler is used to verify URL in the
- // CRWWebController. It must be registered after the HttpProtocolHandler
- // because handlers are called in the reverse order of declaration.
- success =
- [NSURLProtocol registerClass:[CRWURLVerifyingProtocolHandler class]];
- DCHECK(success);
- _requestTrackerFactory.reset(
- new web::RequestTrackerFactoryImpl(std::string()));
- net::RequestTracker::SetRequestTrackerFactory(_requestTrackerFactory.get());
net::CookieStoreIOS::SetCookiePolicy(net::CookieStoreIOS::ALLOW);
}
« no previous file with comments | « ios/web/shell/DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698