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

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

Issue 606113005: Move RenderViewHost swap out state to RenderFrameHost. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix review suggestions Created 6 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_PROXY_HOST_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_PROXY_HOST_H_
6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_PROXY_HOST_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_PROXY_HOST_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "content/browser/frame_host/render_frame_host_impl.h" 9 #include "content/browser/frame_host/render_frame_host_impl.h"
10 #include "content/browser/site_instance_impl.h" 10 #include "content/browser/site_instance_impl.h"
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 void SetChildRWHView(RenderWidgetHostView* view); 82 void SetChildRWHView(RenderWidgetHostView* view);
83 83
84 // TODO(nasko): The following methods should be removed once we don't have a 84 // TODO(nasko): The following methods should be removed once we don't have a
85 // swapped out state on RenderFrameHosts. See https://crbug.com/357747. 85 // swapped out state on RenderFrameHosts. See https://crbug.com/357747.
86 RenderFrameHostImpl* render_frame_host() { 86 RenderFrameHostImpl* render_frame_host() {
87 return render_frame_host_.get(); 87 return render_frame_host_.get();
88 } 88 }
89 RenderViewHostImpl* GetRenderViewHost(); 89 RenderViewHostImpl* GetRenderViewHost();
90 90
91 void TakeFrameHostOwnership( 91 void TakeFrameHostOwnership(
92 scoped_ptr<RenderFrameHostImpl> render_frame_host) { 92 scoped_ptr<RenderFrameHostImpl> render_frame_host);
93 render_frame_host_ = render_frame_host.Pass();
94 }
95 scoped_ptr<RenderFrameHostImpl> PassFrameHostOwnership(); 93 scoped_ptr<RenderFrameHostImpl> PassFrameHostOwnership();
96 94
97 // IPC::Sender 95 // IPC::Sender
98 virtual bool Send(IPC::Message* msg) OVERRIDE; 96 virtual bool Send(IPC::Message* msg) OVERRIDE;
99 97
100 // IPC::Listener 98 // IPC::Listener
101 virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE; 99 virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
102 100
103 CrossProcessFrameConnector* cross_process_frame_connector() { 101 CrossProcessFrameConnector* cross_process_frame_connector() {
104 return cross_process_frame_connector_.get(); 102 return cross_process_frame_connector_.get();
(...skipping 22 matching lines...) Expand all
127 // TODO(nasko): This can be removed once we don't have a swapped out state on 125 // TODO(nasko): This can be removed once we don't have a swapped out state on
128 // RenderFrameHosts. See https://crbug.com/357747. 126 // RenderFrameHosts. See https://crbug.com/357747.
129 scoped_ptr<RenderFrameHostImpl> render_frame_host_; 127 scoped_ptr<RenderFrameHostImpl> render_frame_host_;
130 128
131 DISALLOW_COPY_AND_ASSIGN(RenderFrameProxyHost); 129 DISALLOW_COPY_AND_ASSIGN(RenderFrameProxyHost);
132 }; 130 };
133 131
134 } // namespace 132 } // namespace
135 133
136 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_PROXY_HOST_H_ 134 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_PROXY_HOST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698