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

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

Issue 135723003: Move DidCommitProvisionalLoad code from RenderView to RenderFrame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed unit tests and removed WebContents::DidNavigate Created 6 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 | Annotate | Revision Log
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_NAVIGATOR_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_H_
6 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_H_
7 7
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "content/common/content_export.h" 9 #include "content/common/content_export.h"
10 #include "content/public/browser/navigation_controller.h" 10 #include "content/public/browser/navigation_controller.h"
11 11
12 class GURL; 12 class GURL;
13 struct FrameHostMsg_DidCommitProvisionalLoad_Params;
13 struct FrameHostMsg_DidFailProvisionalLoadWithError_Params; 14 struct FrameHostMsg_DidFailProvisionalLoadWithError_Params;
14 15
15 namespace base { 16 namespace base {
16 class TimeTicks; 17 class TimeTicks;
17 } 18 }
18 19
19 namespace content { 20 namespace content {
20 21
21 class NavigationControllerImpl; 22 class NavigationControllerImpl;
22 class NavigationEntryImpl; 23 class NavigationEntryImpl;
(...skipping 25 matching lines...) Expand all
48 // 49 //
49 // TODO(creis): Remove this method and have the pre-rendering code listen to 50 // TODO(creis): Remove this method and have the pre-rendering code listen to
50 // WebContentsObserver::DidGetRedirectForResourceRequest instead. 51 // WebContentsObserver::DidGetRedirectForResourceRequest instead.
51 // See http://crbug.com/78512. 52 // See http://crbug.com/78512.
52 virtual void DidRedirectProvisionalLoad( 53 virtual void DidRedirectProvisionalLoad(
53 RenderFrameHostImpl* render_frame_host, 54 RenderFrameHostImpl* render_frame_host,
54 int32 page_id, 55 int32 page_id,
55 const GURL& source_url, 56 const GURL& source_url,
56 const GURL& target_url) {} 57 const GURL& target_url) {}
57 58
59 // The RenderFrameHostImpl has has committed a navigation.
Charlie Reis 2014/02/06 21:49:07 nit: has has
nasko 2014/02/06 21:58:43 Done.
60 virtual void DidNavigate(
61 RenderFrameHostImpl* render_frame_host,
62 const FrameHostMsg_DidCommitProvisionalLoad_Params& params) {}
63
58 // Causes the Navigator to navigate in the right render frame to |entry|, 64 // Causes the Navigator to navigate in the right render frame to |entry|,
59 // which must be already part of the entries in the navigation controller. 65 // which must be already part of the entries in the navigation controller.
60 // This does not change the NavigationController state. 66 // This does not change the NavigationController state.
61 virtual bool NavigateToEntry( 67 virtual bool NavigateToEntry(
62 RenderFrameHostImpl* render_frame_host, 68 RenderFrameHostImpl* render_frame_host,
63 const NavigationEntryImpl& entry, 69 const NavigationEntryImpl& entry,
64 NavigationController::ReloadType reload_type); 70 NavigationController::ReloadType reload_type);
65 71
66 // Called by the NavigationController to cause the Navigator to navigate 72 // Called by the NavigationController to cause the Navigator to navigate
67 // to the current pending entry. The NavigationController should be called 73 // to the current pending entry. The NavigationController should be called
(...skipping 16 matching lines...) Expand all
84 virtual base::TimeTicks GetCurrentLoadStart(); 90 virtual base::TimeTicks GetCurrentLoadStart();
85 91
86 protected: 92 protected:
87 friend class base::RefCounted<Navigator>; 93 friend class base::RefCounted<Navigator>;
88 virtual ~Navigator() {} 94 virtual ~Navigator() {}
89 }; 95 };
90 96
91 } // namespace content 97 } // namespace content
92 98
93 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_H_ 99 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698