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 546 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
557 // more. | 557 // more. |
558 void SetPendingNavigationParams( | 558 void SetPendingNavigationParams( |
559 scoped_ptr<NavigationParams> navigation_params); | 559 scoped_ptr<NavigationParams> navigation_params); |
560 | 560 |
561 protected: | 561 protected: |
562 RenderFrameImpl(RenderViewImpl* render_view, int32 routing_id); | 562 RenderFrameImpl(RenderViewImpl* render_view, int32 routing_id); |
563 | 563 |
564 private: | 564 private: |
565 friend class RenderFrameImplTest; | 565 friend class RenderFrameImplTest; |
566 friend class RenderFrameObserver; | 566 friend class RenderFrameObserver; |
567 friend class RenderViewImplTest; | |
clamy
2015/04/08 14:19:30
This is to not make the OnCommitNavigation handler
carlosk
2015/04/08 15:16:42
Instead of friending the test you could call OnMes
clamy
2015/04/09 15:55:06
Considering Nasko's comment at line 539, I will ha
Charlie Reis
2015/04/09 16:04:51
Actually, Nasko was referring to the FRIEND_TEST_A
| |
567 friend class RendererAccessibilityTest; | 568 friend class RendererAccessibilityTest; |
568 FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuDisplayNoneTest, SelectItem); | 569 FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuDisplayNoneTest, SelectItem); |
569 FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuRemoveTest, RemoveOnChange); | 570 FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuRemoveTest, RemoveOnChange); |
570 FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuTest, NormalCase); | 571 FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuTest, NormalCase); |
571 FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuTest, ShowPopupThenNavigate); | 572 FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuTest, ShowPopupThenNavigate); |
572 FRIEND_TEST_ALL_PREFIXES(RendererAccessibilityTest, | 573 FRIEND_TEST_ALL_PREFIXES(RendererAccessibilityTest, |
573 AccessibilityMessagesQueueWhileSwappedOut); | 574 AccessibilityMessagesQueueWhileSwappedOut); |
574 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, | 575 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, |
575 OnExtendSelectionAndDelete); | 576 OnExtendSelectionAndDelete); |
576 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, ReloadWhileSwappedOut); | 577 FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, ReloadWhileSwappedOut); |
(...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
924 #endif | 925 #endif |
925 | 926 |
926 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; | 927 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; |
927 | 928 |
928 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); | 929 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); |
929 }; | 930 }; |
930 | 931 |
931 } // namespace content | 932 } // namespace content |
932 | 933 |
933 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ | 934 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ |
OLD | NEW |