| 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 <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| (...skipping 443 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 454 | 454 |
| 455 // TODO(nasko): Make all tests in RenderViewImplTest friends and then move | 455 // TODO(nasko): Make all tests in RenderViewImplTest friends and then move |
| 456 // this back to private member. | 456 // this back to private member. |
| 457 void OnNavigate(const FrameMsg_Navigate_Params& params); | 457 void OnNavigate(const FrameMsg_Navigate_Params& params); |
| 458 | 458 |
| 459 // Binds this render frame's service registry to a handle to the remote | 459 // Binds this render frame's service registry to a handle to the remote |
| 460 // service registry. | 460 // service registry. |
| 461 void BindServiceRegistry( | 461 void BindServiceRegistry( |
| 462 mojo::ScopedMessagePipeHandle service_provider_handle); | 462 mojo::ScopedMessagePipeHandle service_provider_handle); |
| 463 | 463 |
| 464 ManifestManager* manifest_manager(); |
| 465 |
| 464 protected: | 466 protected: |
| 465 RenderFrameImpl(RenderViewImpl* render_view, int32 routing_id); | 467 RenderFrameImpl(RenderViewImpl* render_view, int32 routing_id); |
| 466 | 468 |
| 467 private: | 469 private: |
| 468 friend class RenderFrameObserver; | 470 friend class RenderFrameObserver; |
| 469 friend class RendererAccessibilityTest; | 471 friend class RendererAccessibilityTest; |
| 470 FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuDisplayNoneTest, SelectItem); | 472 FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuDisplayNoneTest, SelectItem); |
| 471 FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuRemoveTest, RemoveOnChange); | 473 FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuRemoveTest, RemoveOnChange); |
| 472 FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuTest, NormalCase); | 474 FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuTest, NormalCase); |
| 473 FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuTest, ShowPopupThenNavigate); | 475 FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuTest, ShowPopupThenNavigate); |
| (...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 753 #endif | 755 #endif |
| 754 | 756 |
| 755 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; | 757 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; |
| 756 | 758 |
| 757 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); | 759 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); |
| 758 }; | 760 }; |
| 759 | 761 |
| 760 } // namespace content | 762 } // namespace content |
| 761 | 763 |
| 762 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ | 764 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ |
| OLD | NEW |