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

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

Issue 1635873003: Replicating WebFrame::uniqueName across renderers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dump-render-tree3
Patch Set: Fixing fallout from the new assert in FrameTree.cpp. Created 4 years, 10 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_IMPL_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 220
221 // Called for renderer-created windows to resume requests from this frame, 221 // Called for renderer-created windows to resume requests from this frame,
222 // after they are blocked in RenderWidgetHelper::CreateNewWindow. 222 // after they are blocked in RenderWidgetHelper::CreateNewWindow.
223 void Init(); 223 void Init();
224 224
225 int routing_id() const { return routing_id_; } 225 int routing_id() const { return routing_id_; }
226 void OnCreateChildFrame( 226 void OnCreateChildFrame(
227 int new_routing_id, 227 int new_routing_id,
228 blink::WebTreeScopeType scope, 228 blink::WebTreeScopeType scope,
229 const std::string& frame_name, 229 const std::string& frame_name,
230 const std::string& frame_unique_name,
230 blink::WebSandboxFlags sandbox_flags, 231 blink::WebSandboxFlags sandbox_flags,
231 const blink::WebFrameOwnerProperties& frame_owner_properties); 232 const blink::WebFrameOwnerProperties& frame_owner_properties);
232 233
233 RenderViewHostImpl* render_view_host() { return render_view_host_; } 234 RenderViewHostImpl* render_view_host() { return render_view_host_; }
234 RenderFrameHostDelegate* delegate() { return delegate_; } 235 RenderFrameHostDelegate* delegate() { return delegate_; }
235 FrameTreeNode* frame_tree_node() { return frame_tree_node_; } 236 FrameTreeNode* frame_tree_node() { return frame_tree_node_; }
236 237
237 // Returns the associated WebUI or null if none applies. 238 // Returns the associated WebUI or null if none applies.
238 WebUIImpl* web_ui() const { return web_ui_.get(); } 239 WebUIImpl* web_ui() const { return web_ui_.get(); }
239 240
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
590 IPC::Message* reply_msg); 591 IPC::Message* reply_msg);
591 void OnRunBeforeUnloadConfirm(const GURL& frame_url, 592 void OnRunBeforeUnloadConfirm(const GURL& frame_url,
592 const base::string16& message, 593 const base::string16& message,
593 bool is_reload, 594 bool is_reload,
594 IPC::Message* reply_msg); 595 IPC::Message* reply_msg);
595 void OnTextSurroundingSelectionResponse(const base::string16& content, 596 void OnTextSurroundingSelectionResponse(const base::string16& content,
596 uint32_t start_offset, 597 uint32_t start_offset,
597 uint32_t end_offset); 598 uint32_t end_offset);
598 void OnDidAccessInitialDocument(); 599 void OnDidAccessInitialDocument();
599 void OnDidChangeOpener(int32_t opener_routing_id); 600 void OnDidChangeOpener(int32_t opener_routing_id);
600 void OnDidChangeName(const std::string& name); 601 void OnDidChangeName(const std::string& name, const std::string& unique_name);
601 void OnEnforceStrictMixedContentChecking(); 602 void OnEnforceStrictMixedContentChecking();
602 void OnDidAssignPageId(int32_t page_id); 603 void OnDidAssignPageId(int32_t page_id);
603 void OnDidChangeSandboxFlags(int32_t frame_routing_id, 604 void OnDidChangeSandboxFlags(int32_t frame_routing_id,
604 blink::WebSandboxFlags flags); 605 blink::WebSandboxFlags flags);
605 void OnDidChangeFrameOwnerProperties( 606 void OnDidChangeFrameOwnerProperties(
606 int32_t frame_routing_id, 607 int32_t frame_routing_id,
607 const blink::WebFrameOwnerProperties& frame_owner_properties); 608 const blink::WebFrameOwnerProperties& frame_owner_properties);
608 void OnUpdateTitle(const base::string16& title, 609 void OnUpdateTitle(const base::string16& title,
609 blink::WebTextDirection title_direction); 610 blink::WebTextDirection title_direction);
610 void OnUpdateEncoding(const std::string& encoding); 611 void OnUpdateEncoding(const std::string& encoding);
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after
894 895
895 // NOTE: This must be the last member. 896 // NOTE: This must be the last member.
896 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_; 897 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_;
897 898
898 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl); 899 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl);
899 }; 900 };
900 901
901 } // namespace content 902 } // namespace content
902 903
903 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 904 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698