| OLD | NEW |
| 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_RENDERER_RENDER_FRAME_IMPL_H_ | 5 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ |
| 6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ | 6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ |
| 7 | 7 |
| 8 #include <stddef.h> | 8 #include <stddef.h> |
| 9 #include <stdint.h> | 9 #include <stdint.h> |
| 10 | 10 |
| (...skipping 1225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1236 // initialized. | 1236 // initialized. |
| 1237 PresentationDispatcher* presentation_dispatcher_; | 1237 PresentationDispatcher* presentation_dispatcher_; |
| 1238 | 1238 |
| 1239 std::unique_ptr<service_manager::InterfaceRegistry> interface_registry_; | 1239 std::unique_ptr<service_manager::InterfaceRegistry> interface_registry_; |
| 1240 std::unique_ptr<service_manager::InterfaceProvider> remote_interfaces_; | 1240 std::unique_ptr<service_manager::InterfaceProvider> remote_interfaces_; |
| 1241 std::unique_ptr<BlinkInterfaceProviderImpl> blink_interface_provider_; | 1241 std::unique_ptr<BlinkInterfaceProviderImpl> blink_interface_provider_; |
| 1242 std::unique_ptr<BlinkInterfaceRegistryImpl> blink_interface_registry_; | 1242 std::unique_ptr<BlinkInterfaceRegistryImpl> blink_interface_registry_; |
| 1243 service_manager::mojom::InterfaceProviderRequest | 1243 service_manager::mojom::InterfaceProviderRequest |
| 1244 pending_remote_interface_provider_request_; | 1244 pending_remote_interface_provider_request_; |
| 1245 | 1245 |
| 1246 service_manager::ServiceInfo local_info_; |
| 1247 service_manager::ServiceInfo remote_info_; |
| 1248 |
| 1246 // The Connector proxy used to connect to services. | 1249 // The Connector proxy used to connect to services. |
| 1247 service_manager::mojom::ConnectorPtr connector_; | 1250 service_manager::mojom::ConnectorPtr connector_; |
| 1248 | 1251 |
| 1249 // The screen orientation dispatcher attached to the frame, lazily | 1252 // The screen orientation dispatcher attached to the frame, lazily |
| 1250 // initialized. | 1253 // initialized. |
| 1251 ScreenOrientationDispatcher* screen_orientation_dispatcher_; | 1254 ScreenOrientationDispatcher* screen_orientation_dispatcher_; |
| 1252 | 1255 |
| 1253 // The Manifest Manager handles the manifest requests from the browser | 1256 // The Manifest Manager handles the manifest requests from the browser |
| 1254 // process. | 1257 // process. |
| 1255 ManifestManager* manifest_manager_; | 1258 ManifestManager* manifest_manager_; |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1327 bool name_changed_before_first_commit_ = false; | 1330 bool name_changed_before_first_commit_ = false; |
| 1328 | 1331 |
| 1329 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; | 1332 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; |
| 1330 | 1333 |
| 1331 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); | 1334 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); |
| 1332 }; | 1335 }; |
| 1333 | 1336 |
| 1334 } // namespace content | 1337 } // namespace content |
| 1335 | 1338 |
| 1336 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ | 1339 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ |
| OLD | NEW |