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

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

Issue 1262563003: Subframes in inner WebContents should not create proxies in process of outer WebContents. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments from lfg@ Created 5 years, 4 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_MANAGER_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_
6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_
7 7
8 #include <list> 8 #include <list>
9 #include <map> 9 #include <map>
10 10
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 return render_frame_host_.get(); 226 return render_frame_host_.get();
227 } 227 }
228 228
229 // TODO(creis): Remove this when we no longer use RVH for navigation. 229 // TODO(creis): Remove this when we no longer use RVH for navigation.
230 RenderViewHostImpl* current_host() const; 230 RenderViewHostImpl* current_host() const;
231 231
232 // Returns the view associated with the current RenderViewHost, or NULL if 232 // Returns the view associated with the current RenderViewHost, or NULL if
233 // there is no current one. 233 // there is no current one.
234 RenderWidgetHostView* GetRenderWidgetHostView() const; 234 RenderWidgetHostView* GetRenderWidgetHostView() const;
235 235
236 // Returns whether this manager belongs to a FrameTreeNode that is a main 236 // Returns whether this manager belongs to a FrameTreeNode that belongs to an
237 // frame in an inner WebContents. 237 // inner WebContents.
238 // TODO(lazyboy): Make this work correctly for subframes inside inner
239 // WebContents too.
240 bool ForInnerDelegate(); 238 bool ForInnerDelegate();
241 239
242 // Returns the RenderWidgetHost of the outer WebContents (if any) that can be 240 // Returns the RenderWidgetHost of the outer WebContents (if any) that can be
243 // used to fetch the last keyboard event. 241 // used to fetch the last keyboard event.
244 // TODO(lazyboy): This can be removed once input events are sent directly to 242 // TODO(lazyboy): This can be removed once input events are sent directly to
245 // remote frames. 243 // remote frames.
246 RenderWidgetHostImpl* GetOuterRenderWidgetHostForKeyboardInput(); 244 RenderWidgetHostImpl* GetOuterRenderWidgetHostForKeyboardInput();
247 245
248 RenderFrameProxyHost* GetProxyToParent(); 246 RenderFrameProxyHost* GetProxyToParent();
249 247
(...skipping 548 matching lines...) Expand 10 before | Expand all | Expand 10 after
798 bool should_reuse_web_ui_; 796 bool should_reuse_web_ui_;
799 797
800 base::WeakPtrFactory<RenderFrameHostManager> weak_factory_; 798 base::WeakPtrFactory<RenderFrameHostManager> weak_factory_;
801 799
802 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManager); 800 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManager);
803 }; 801 };
804 802
805 } // namespace content 803 } // namespace content
806 804
807 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_ 805 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_
OLDNEW
« no previous file with comments | « content/browser/frame_host/cross_process_frame_connector.cc ('k') | content/browser/frame_host/render_frame_host_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698