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

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

Issue 1255103003: Fix race when reloading original URL. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2454
Patch Set: 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 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 // PlzNavigate 285 // PlzNavigate
286 // Returns the speculative WebUI for the navigation (a newly created one or 286 // Returns the speculative WebUI for the navigation (a newly created one or
287 // the current one if it should be reused). If none is set returns nullptr. 287 // the current one if it should be reused). If none is set returns nullptr.
288 WebUIImpl* speculative_web_ui() const { 288 WebUIImpl* speculative_web_ui() const {
289 return should_reuse_web_ui_ ? web_ui_.get() : speculative_web_ui_.get(); 289 return should_reuse_web_ui_ ? web_ui_.get() : speculative_web_ui_.get();
290 } 290 }
291 291
292 // Called when we want to instruct the renderer to navigate to the given 292 // Called when we want to instruct the renderer to navigate to the given
293 // navigation entry. It may create a new RenderFrameHost or re-use an existing 293 // navigation entry. It may create a new RenderFrameHost or re-use an existing
294 // one. The RenderFrameHost to navigate will be returned. Returns NULL if one 294 // one. The RenderFrameHost to navigate will be returned. Returns NULL if one
295 // could not be created. 295 // could not be created. |dest_url| takes precedence over the |frame_entry|'s
296 RenderFrameHostImpl* Navigate(const FrameNavigationEntry& frame_entry, 296 // url (this is necessary because ReloadOriginalRequest navigates to a
297 // different URL than the last committed entry, without modifying it).
298 RenderFrameHostImpl* Navigate(const GURL& dest_url,
299 const FrameNavigationEntry& frame_entry,
297 const NavigationEntryImpl& entry); 300 const NavigationEntryImpl& entry);
298 301
299 // Instructs the various live views to stop. Called when the user directed the 302 // Instructs the various live views to stop. Called when the user directed the
300 // page to stop loading. 303 // page to stop loading.
301 void Stop(); 304 void Stop();
302 305
303 // Notifies the regular and pending RenderViewHosts that a load is or is not 306 // Notifies the regular and pending RenderViewHosts that a load is or is not
304 // happening. Even though the message is only for one of them, we don't know 307 // happening. Even though the message is only for one of them, we don't know
305 // which one so we tell both. 308 // which one so we tell both.
306 void SetIsLoading(bool is_loading); 309 void SetIsLoading(bool is_loading);
(...skipping 492 matching lines...) Expand 10 before | Expand all | Expand 10 after
799 bool should_reuse_web_ui_; 802 bool should_reuse_web_ui_;
800 803
801 base::WeakPtrFactory<RenderFrameHostManager> weak_factory_; 804 base::WeakPtrFactory<RenderFrameHostManager> weak_factory_;
802 805
803 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManager); 806 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManager);
804 }; 807 };
805 808
806 } // namespace content 809 } // namespace content
807 810
808 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_ 811 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_
OLDNEW
« no previous file with comments | « content/browser/frame_host/navigator_impl.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