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

Side by Side Diff: content/browser/frame_host/render_frame_host_impl.h

Issue 2217013002: Remove the JNI-based InterfaceRegistry. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@java-interface-registry-migration
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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 28 matching lines...) Expand all
39 #include "media/mojo/interfaces/service_factory.mojom.h" 39 #include "media/mojo/interfaces/service_factory.mojom.h"
40 #include "net/http/http_response_headers.h" 40 #include "net/http/http_response_headers.h"
41 #include "services/shell/public/cpp/interface_factory.h" 41 #include "services/shell/public/cpp/interface_factory.h"
42 #include "services/shell/public/cpp/interface_registry.h" 42 #include "services/shell/public/cpp/interface_registry.h"
43 #include "third_party/WebKit/public/platform/WebInsecureRequestPolicy.h" 43 #include "third_party/WebKit/public/platform/WebInsecureRequestPolicy.h"
44 #include "third_party/WebKit/public/web/WebTextDirection.h" 44 #include "third_party/WebKit/public/web/WebTextDirection.h"
45 #include "third_party/WebKit/public/web/WebTreeScopeType.h" 45 #include "third_party/WebKit/public/web/WebTreeScopeType.h"
46 #include "ui/accessibility/ax_node_data.h" 46 #include "ui/accessibility/ax_node_data.h"
47 #include "ui/base/page_transition_types.h" 47 #include "ui/base/page_transition_types.h"
48 48
49 #if defined(OS_ANDROID)
50 #include "content/public/browser/android/interface_registry_android.h"
51 #endif
52
53 class GURL; 49 class GURL;
54 struct AccessibilityHostMsg_EventParams; 50 struct AccessibilityHostMsg_EventParams;
55 struct AccessibilityHostMsg_FindInPageResultParams; 51 struct AccessibilityHostMsg_FindInPageResultParams;
56 struct AccessibilityHostMsg_LocationChangeParams; 52 struct AccessibilityHostMsg_LocationChangeParams;
57 struct FrameHostMsg_DidFailProvisionalLoadWithError_Params; 53 struct FrameHostMsg_DidFailProvisionalLoadWithError_Params;
58 struct FrameHostMsg_OpenURL_Params; 54 struct FrameHostMsg_OpenURL_Params;
59 struct FrameMsg_TextTrackSettings_Params; 55 struct FrameMsg_TextTrackSettings_Params;
60 #if defined(USE_EXTERNAL_POPUP_MENU) 56 #if defined(USE_EXTERNAL_POPUP_MENU)
61 struct FrameHostMsg_ShowPopup_Params; 57 struct FrameHostMsg_ShowPopup_Params;
62 #endif 58 #endif
(...skipping 893 matching lines...) Expand 10 before | Expand all | Expand 10 after
956 int nav_entry_id_; 952 int nav_entry_id_;
957 953
958 // Used to swap out or shut down this RFH when the unload event is taking too 954 // Used to swap out or shut down this RFH when the unload event is taking too
959 // long to execute, depending on the number of active frames in the 955 // long to execute, depending on the number of active frames in the
960 // SiteInstance. May be null in tests. 956 // SiteInstance. May be null in tests.
961 std::unique_ptr<TimeoutMonitor> swapout_event_monitor_timeout_; 957 std::unique_ptr<TimeoutMonitor> swapout_event_monitor_timeout_;
962 958
963 std::unique_ptr<shell::InterfaceRegistry> interface_registry_; 959 std::unique_ptr<shell::InterfaceRegistry> interface_registry_;
964 std::unique_ptr<shell::InterfaceProvider> remote_interfaces_; 960 std::unique_ptr<shell::InterfaceProvider> remote_interfaces_;
965 961
966 #if defined(OS_ANDROID)
967 std::unique_ptr<InterfaceRegistryAndroid> interface_registry_android_;
968 #endif
969
970 std::unique_ptr<WebBluetoothServiceImpl> web_bluetooth_service_; 962 std::unique_ptr<WebBluetoothServiceImpl> web_bluetooth_service_;
971 963
972 // The object managing the accessibility tree for this frame. 964 // The object managing the accessibility tree for this frame.
973 std::unique_ptr<BrowserAccessibilityManager> browser_accessibility_manager_; 965 std::unique_ptr<BrowserAccessibilityManager> browser_accessibility_manager_;
974 966
975 // This is nonzero if we sent an accessibility reset to the renderer and 967 // This is nonzero if we sent an accessibility reset to the renderer and
976 // we're waiting for an IPC containing this reset token (sequentially 968 // we're waiting for an IPC containing this reset token (sequentially
977 // assigned) and a complete replacement accessibility tree. 969 // assigned) and a complete replacement accessibility tree.
978 int accessibility_reset_token_; 970 int accessibility_reset_token_;
979 971
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
1053 1045
1054 // NOTE: This must be the last member. 1046 // NOTE: This must be the last member.
1055 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_; 1047 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_;
1056 1048
1057 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl); 1049 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl);
1058 }; 1050 };
1059 1051
1060 } // namespace content 1052 } // namespace content
1061 1053
1062 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 1054 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
OLDNEW
« no previous file with comments | « content/browser/android/interface_registry_android_impl.cc ('k') | content/browser/frame_host/render_frame_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698