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

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

Issue 2847743003: Eliminate InterfaceRegistry (Closed)
Patch Set: . Created 3 years, 7 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
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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 #import "ios/web/public/web_state/page_display_state.h" 67 #import "ios/web/public/web_state/page_display_state.h"
68 #include "ios/web/public/web_state/session_certificate_policy_cache.h" 68 #include "ios/web/public/web_state/session_certificate_policy_cache.h"
69 #import "ios/web/public/web_state/ui/crw_content_view.h" 69 #import "ios/web/public/web_state/ui/crw_content_view.h"
70 #import "ios/web/public/web_state/ui/crw_context_menu_delegate.h" 70 #import "ios/web/public/web_state/ui/crw_context_menu_delegate.h"
71 #import "ios/web/public/web_state/ui/crw_native_content.h" 71 #import "ios/web/public/web_state/ui/crw_native_content.h"
72 #import "ios/web/public/web_state/ui/crw_native_content_provider.h" 72 #import "ios/web/public/web_state/ui/crw_native_content_provider.h"
73 #import "ios/web/public/web_state/ui/crw_web_view_content_view.h" 73 #import "ios/web/public/web_state/ui/crw_web_view_content_view.h"
74 #import "ios/web/public/web_state/ui/crw_web_view_scroll_view_proxy.h" 74 #import "ios/web/public/web_state/ui/crw_web_view_scroll_view_proxy.h"
75 #include "ios/web/public/web_state/url_verification_constants.h" 75 #include "ios/web/public/web_state/url_verification_constants.h"
76 #import "ios/web/public/web_state/web_state.h" 76 #import "ios/web/public/web_state/web_state.h"
77 #include "ios/web/public/web_state/web_state_interface_provider.h"
77 #include "ios/web/public/webui/web_ui_ios.h" 78 #include "ios/web/public/webui/web_ui_ios.h"
78 #import "ios/web/web_state/crw_pass_kit_downloader.h" 79 #import "ios/web/web_state/crw_pass_kit_downloader.h"
79 #import "ios/web/web_state/error_translation_util.h" 80 #import "ios/web/web_state/error_translation_util.h"
80 #import "ios/web/web_state/js/crw_js_plugin_placeholder_manager.h" 81 #import "ios/web/web_state/js/crw_js_plugin_placeholder_manager.h"
81 #import "ios/web/web_state/js/crw_js_post_request_loader.h" 82 #import "ios/web/web_state/js/crw_js_post_request_loader.h"
82 #import "ios/web/web_state/js/crw_js_window_id_manager.h" 83 #import "ios/web/web_state/js/crw_js_window_id_manager.h"
83 #import "ios/web/web_state/page_viewport_state.h" 84 #import "ios/web/web_state/page_viewport_state.h"
84 #import "ios/web/web_state/ui/crw_context_menu_controller.h" 85 #import "ios/web/web_state/ui/crw_context_menu_controller.h"
85 #import "ios/web/web_state/ui/crw_swipe_recognizer_provider.h" 86 #import "ios/web/web_state/ui/crw_swipe_recognizer_provider.h"
86 #import "ios/web/web_state/ui/crw_web_controller.h" 87 #import "ios/web/web_state/ui/crw_web_controller.h"
87 #import "ios/web/web_state/ui/crw_web_controller_container_view.h" 88 #import "ios/web/web_state/ui/crw_web_controller_container_view.h"
88 #import "ios/web/web_state/ui/crw_web_view_proxy_impl.h" 89 #import "ios/web/web_state/ui/crw_web_view_proxy_impl.h"
89 #import "ios/web/web_state/ui/crw_wk_navigation_states.h" 90 #import "ios/web/web_state/ui/crw_wk_navigation_states.h"
90 #import "ios/web/web_state/ui/crw_wk_script_message_router.h" 91 #import "ios/web/web_state/ui/crw_wk_script_message_router.h"
91 #import "ios/web/web_state/ui/wk_back_forward_list_item_holder.h" 92 #import "ios/web/web_state/ui/wk_back_forward_list_item_holder.h"
92 #import "ios/web/web_state/ui/wk_web_view_configuration_provider.h" 93 #import "ios/web/web_state/ui/wk_web_view_configuration_provider.h"
93 #import "ios/web/web_state/web_controller_observer_bridge.h" 94 #import "ios/web/web_state/web_controller_observer_bridge.h"
94 #import "ios/web/web_state/web_state_impl.h" 95 #import "ios/web/web_state/web_state_impl.h"
95 #import "ios/web/web_state/web_view_internal_creation_util.h" 96 #import "ios/web/web_state/web_view_internal_creation_util.h"
96 #import "ios/web/web_state/wk_web_view_security_util.h" 97 #import "ios/web/web_state/wk_web_view_security_util.h"
97 #import "ios/web/webui/crw_web_ui_manager.h" 98 #import "ios/web/webui/crw_web_ui_manager.h"
98 #import "ios/web/webui/mojo_facade.h" 99 #import "ios/web/webui/mojo_facade.h"
99 #import "net/base/mac/url_conversions.h" 100 #import "net/base/mac/url_conversions.h"
100 #include "net/base/net_errors.h" 101 #include "net/base/net_errors.h"
101 #include "net/ssl/ssl_info.h" 102 #include "net/ssl/ssl_info.h"
102 #include "services/service_manager/public/cpp/interface_registry.h"
103 #include "ui/base/page_transition_types.h" 103 #include "ui/base/page_transition_types.h"
104 #include "url/gurl.h" 104 #include "url/gurl.h"
105 #include "url/url_constants.h" 105 #include "url/url_constants.h"
106 106
107 using base::UserMetricsAction; 107 using base::UserMetricsAction;
108 using web::NavigationManager; 108 using web::NavigationManager;
109 using web::NavigationManagerImpl; 109 using web::NavigationManagerImpl;
110 using web::WebState; 110 using web::WebState;
111 using web::WebStateImpl; 111 using web::WebStateImpl;
112 112
(...skipping 2088 matching lines...) Expand 10 before | Expand all | Expand 10 after
2201 } 2201 }
2202 2202
2203 - (web::UserAgentType)userAgentType { 2203 - (web::UserAgentType)userAgentType {
2204 web::NavigationItem* item = self.currentNavItem; 2204 web::NavigationItem* item = self.currentNavItem;
2205 return item ? item->GetUserAgentType() : web::UserAgentType::MOBILE; 2205 return item ? item->GetUserAgentType() : web::UserAgentType::MOBILE;
2206 } 2206 }
2207 2207
2208 - (web::MojoFacade*)mojoFacade { 2208 - (web::MojoFacade*)mojoFacade {
2209 if (!_mojoFacade) { 2209 if (!_mojoFacade) {
2210 service_manager::mojom::InterfaceProvider* interfaceProvider = 2210 service_manager::mojom::InterfaceProvider* interfaceProvider =
2211 _webStateImpl->GetMojoInterfaceRegistry(); 2211 _webStateImpl->GetWebStateInterfaceProvider();
2212 _mojoFacade.reset(new web::MojoFacade(interfaceProvider, self)); 2212 _mojoFacade.reset(new web::MojoFacade(interfaceProvider, self));
2213 } 2213 }
2214 return _mojoFacade.get(); 2214 return _mojoFacade.get();
2215 } 2215 }
2216 2216
2217 - (CRWPassKitDownloader*)passKitDownloader { 2217 - (CRWPassKitDownloader*)passKitDownloader {
2218 if (_passKitDownloader) { 2218 if (_passKitDownloader) {
2219 return _passKitDownloader.get(); 2219 return _passKitDownloader.get();
2220 } 2220 }
2221 base::WeakNSObject<CRWWebController> weakSelf(self); 2221 base::WeakNSObject<CRWWebController> weakSelf(self);
(...skipping 2841 matching lines...) Expand 10 before | Expand all | Expand 10 after
5063 - (NSUInteger)observerCount { 5063 - (NSUInteger)observerCount {
5064 DCHECK_EQ(_observerBridges.size(), [_observers count]); 5064 DCHECK_EQ(_observerBridges.size(), [_observers count]);
5065 return [_observers count]; 5065 return [_observers count];
5066 } 5066 }
5067 5067
5068 - (NSString*)referrerFromNavigationAction:(WKNavigationAction*)action { 5068 - (NSString*)referrerFromNavigationAction:(WKNavigationAction*)action {
5069 return [action.request valueForHTTPHeaderField:kReferrerHeaderName]; 5069 return [action.request valueForHTTPHeaderField:kReferrerHeaderName];
5070 } 5070 }
5071 5071
5072 @end 5072 @end
OLDNEW
« no previous file with comments | « ios/web/public/web_state/web_state_interface_provider.cc ('k') | ios/web/web_state/web_state_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698