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

Side by Side Diff: ios/web/web_state/ui/crw_web_controller.mm

Issue 2419723002: Move services/shell to services/service_manager (Closed)
Patch Set: rebase Created 4 years, 2 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 unified diff | Download patch
« no previous file with comments | « ios/web/DEPS ('k') | ios/web/web_state/web_state_impl.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import "ios/web/web_state/ui/crw_web_controller.h" 5 #import "ios/web/web_state/ui/crw_web_controller.h"
6 6
7 #import <WebKit/WebKit.h> 7 #import <WebKit/WebKit.h>
8 8
9 #import <objc/runtime.h> 9 #import <objc/runtime.h>
10 #include <stddef.h> 10 #include <stddef.h>
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 #import "ios/web/web_state/ui/wk_web_view_configuration_provider.h" 95 #import "ios/web/web_state/ui/wk_web_view_configuration_provider.h"
96 #import "ios/web/web_state/web_controller_observer_bridge.h" 96 #import "ios/web/web_state/web_controller_observer_bridge.h"
97 #include "ios/web/web_state/web_state_facade_delegate.h" 97 #include "ios/web/web_state/web_state_facade_delegate.h"
98 #import "ios/web/web_state/web_state_impl.h" 98 #import "ios/web/web_state/web_state_impl.h"
99 #import "ios/web/web_state/web_view_internal_creation_util.h" 99 #import "ios/web/web_state/web_view_internal_creation_util.h"
100 #import "ios/web/web_state/wk_web_view_security_util.h" 100 #import "ios/web/web_state/wk_web_view_security_util.h"
101 #import "ios/web/webui/crw_web_ui_manager.h" 101 #import "ios/web/webui/crw_web_ui_manager.h"
102 #import "ios/web/webui/mojo_facade.h" 102 #import "ios/web/webui/mojo_facade.h"
103 #import "net/base/mac/url_conversions.h" 103 #import "net/base/mac/url_conversions.h"
104 #include "net/base/net_errors.h" 104 #include "net/base/net_errors.h"
105 #include "services/shell/public/cpp/interface_registry.h" 105 #include "services/service_manager/public/cpp/interface_registry.h"
106 #include "ui/base/page_transition_types.h" 106 #include "ui/base/page_transition_types.h"
107 #include "url/gurl.h" 107 #include "url/gurl.h"
108 #include "url/url_constants.h" 108 #include "url/url_constants.h"
109 109
110 using base::UserMetricsAction; 110 using base::UserMetricsAction;
111 using web::NavigationManager; 111 using web::NavigationManager;
112 using web::NavigationManagerImpl; 112 using web::NavigationManagerImpl;
113 using web::WebState; 113 using web::WebState;
114 using web::WebStateImpl; 114 using web::WebStateImpl;
115 115
(...skipping 5533 matching lines...) Expand 10 before | Expand all | Expand 10 after
5649 } 5649 }
5650 5650
5651 return web::WEB_VIEW_DOCUMENT_TYPE_GENERIC; 5651 return web::WEB_VIEW_DOCUMENT_TYPE_GENERIC;
5652 } 5652 }
5653 5653
5654 - (NSString*)refererFromNavigationAction:(WKNavigationAction*)action { 5654 - (NSString*)refererFromNavigationAction:(WKNavigationAction*)action {
5655 return [action.request valueForHTTPHeaderField:@"Referer"]; 5655 return [action.request valueForHTTPHeaderField:@"Referer"];
5656 } 5656 }
5657 5657
5658 @end 5658 @end
OLDNEW
« no previous file with comments | « ios/web/DEPS ('k') | ios/web/web_state/web_state_impl.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698