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

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

Issue 1418853003: Remove RFHM::GetNavigatingWebUI() and RFHM::web_ui(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@webui-refactor
Patch Set: Remove RFHM::web_ui(). Created 5 years, 1 month 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 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 245
246 // Returns the speculative RenderFrameHost, or null if there is no speculative 246 // Returns the speculative RenderFrameHost, or null if there is no speculative
247 // one. 247 // one.
248 RenderFrameHostImpl* speculative_frame_host() const { 248 RenderFrameHostImpl* speculative_frame_host() const {
249 return speculative_render_frame_host_.get(); 249 return speculative_render_frame_host_.get();
250 } 250 }
251 251
252 // TODO(creis): Remove this when we no longer use RVH for navigation. 252 // TODO(creis): Remove this when we no longer use RVH for navigation.
253 RenderViewHostImpl* pending_render_view_host() const; 253 RenderViewHostImpl* pending_render_view_host() const;
254 254
255 // Returns the current committed WebUI or null if none applies.
256 WebUIImpl* web_ui() const { return render_frame_host_->web_ui(); }
257
258 // Returns the WebUI associated with the RenderFrameHost that is currently
259 // navigating or null if none applies.
260 WebUIImpl* GetNavigatingWebUI() const;
261
262 // Called when we want to instruct the renderer to navigate to the given 255 // Called when we want to instruct the renderer to navigate to the given
263 // navigation entry. It may create a new RenderFrameHost or re-use an existing 256 // navigation entry. It may create a new RenderFrameHost or re-use an existing
264 // one. The RenderFrameHost to navigate will be returned. Returns NULL if one 257 // one. The RenderFrameHost to navigate will be returned. Returns NULL if one
265 // could not be created. |dest_url| takes precedence over the |frame_entry|'s 258 // could not be created. |dest_url| takes precedence over the |frame_entry|'s
266 // url (this is necessary because ReloadOriginalRequest navigates to a 259 // url (this is necessary because ReloadOriginalRequest navigates to a
267 // different URL than the last committed entry, without modifying it). 260 // different URL than the last committed entry, without modifying it).
268 RenderFrameHostImpl* Navigate(const GURL& dest_url, 261 RenderFrameHostImpl* Navigate(const GURL& dest_url,
269 const FrameNavigationEntry& frame_entry, 262 const FrameNavigationEntry& frame_entry,
270 const NavigationEntryImpl& entry); 263 const NavigationEntryImpl& entry);
271 264
(...skipping 504 matching lines...) Expand 10 before | Expand all | Expand 10 after
776 bool current_web_ui_is_navigating_; 769 bool current_web_ui_is_navigating_;
777 770
778 base::WeakPtrFactory<RenderFrameHostManager> weak_factory_; 771 base::WeakPtrFactory<RenderFrameHostManager> weak_factory_;
779 772
780 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManager); 773 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManager);
781 }; 774 };
782 775
783 } // namespace content 776 } // namespace content
784 777
785 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_ 778 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698