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

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

Issue 877343010: PlzNavigate: Fix WebUI creation logic for both cross and same site navigation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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_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 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 230
231 // Returns the Web UI for the pending navigation, or NULL of none applies. 231 // Returns the Web UI for the pending navigation, or NULL of none applies.
232 WebUIImpl* pending_web_ui() const { 232 WebUIImpl* pending_web_ui() const {
233 return pending_web_ui_.get() ? pending_web_ui_.get() : 233 return pending_web_ui_.get() ? pending_web_ui_.get() :
234 pending_and_current_web_ui_.get(); 234 pending_and_current_web_ui_.get();
235 } 235 }
236 236
237 // PlzNavigate 237 // PlzNavigate
238 // Returns the speculative WebUI for the navigation (a newly created one or 238 // Returns the speculative WebUI for the navigation (a newly created one or
239 // the current one if it should be reused). If none is set returns nullptr. 239 // the current one if it should be reused). If none is set returns nullptr.
240 WebUIImpl* speculative_web_ui_for_testing() const { 240 WebUIImpl* speculative_web_ui() const {
241 return should_reuse_web_ui_ ? web_ui_.get() : speculative_web_ui_.get(); 241 return should_reuse_web_ui_ ? web_ui_.get() : speculative_web_ui_.get();
242 } 242 }
243 243
244 // Called when we want to instruct the renderer to navigate to the given 244 // Called when we want to instruct the renderer to navigate to the given
245 // navigation entry. It may create a new RenderFrameHost or re-use an existing 245 // navigation entry. It may create a new RenderFrameHost or re-use an existing
246 // one. The RenderFrameHost to navigate will be returned. Returns NULL if one 246 // one. The RenderFrameHost to navigate will be returned. Returns NULL if one
247 // could not be created. 247 // could not be created.
248 RenderFrameHostImpl* Navigate(const NavigationEntryImpl& entry); 248 RenderFrameHostImpl* Navigate(const NavigationEntryImpl& entry);
249 249
250 // Instructs the various live views to stop. Called when the user directed the 250 // Instructs the various live views to stop. Called when the user directed the
(...skipping 437 matching lines...) Expand 10 before | Expand all | Expand 10 after
688 bool should_reuse_web_ui_; 688 bool should_reuse_web_ui_;
689 689
690 base::WeakPtrFactory<RenderFrameHostManager> weak_factory_; 690 base::WeakPtrFactory<RenderFrameHostManager> weak_factory_;
691 691
692 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManager); 692 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManager);
693 }; 693 };
694 694
695 } // namespace content 695 } // namespace content
696 696
697 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_ 697 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698