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

Side by Side Diff: content/browser/frame_host/interstitial_page_impl.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_INTERSTITIAL_PAGE_IMPL_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_INTERSTITIAL_PAGE_IMPL_H_
6 #define CONTENT_BROWSER_FRAME_HOST_INTERSTITIAL_PAGE_IMPL_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_INTERSTITIAL_PAGE_IMPL_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 reload_on_dont_proceed_ = value; 84 reload_on_dont_proceed_ = value;
85 } 85 }
86 bool reload_on_dont_proceed() const { return reload_on_dont_proceed_; } 86 bool reload_on_dont_proceed() const { return reload_on_dont_proceed_; }
87 87
88 #if defined(OS_ANDROID) 88 #if defined(OS_ANDROID)
89 // Android shares a single platform window for all tabs, so we need to expose 89 // Android shares a single platform window for all tabs, so we need to expose
90 // the RenderViewHost to properly route gestures to the interstitial. 90 // the RenderViewHost to properly route gestures to the interstitial.
91 RenderViewHost* GetRenderViewHost() const; 91 RenderViewHost* GetRenderViewHost() const;
92 #endif 92 #endif
93 93
94 // RenderViewHostDelegate implementation:
Charlie Reis 2014/02/06 21:49:07 We can remove this line, since it's no longer in R
nasko 2014/02/06 21:58:43 Done.
95 // TODO(nasko): This should move to InterstitialPageNavigatorImpl, but in
96 // the meantime make it public, so it can be called directly.
97 void DidNavigate(
98 RenderViewHost* render_view_host,
99 const FrameHostMsg_DidCommitProvisionalLoad_Params& params);
100
94 protected: 101 protected:
95 // NotificationObserver method: 102 // NotificationObserver method:
96 virtual void Observe(int type, 103 virtual void Observe(int type,
97 const NotificationSource& source, 104 const NotificationSource& source,
98 const NotificationDetails& details) OVERRIDE; 105 const NotificationDetails& details) OVERRIDE;
99 106
100 // WebContentsObserver implementation: 107 // WebContentsObserver implementation:
101 virtual void WebContentsDestroyed(WebContents* web_contents) OVERRIDE; 108 virtual void WebContentsDestroyed(WebContents* web_contents) OVERRIDE;
102 virtual void NavigationEntryCommitted( 109 virtual void NavigationEntryCommitted(
103 const LoadCommittedDetails& load_details) OVERRIDE; 110 const LoadCommittedDetails& load_details) OVERRIDE;
104 111
105 // RenderFrameHostDelegate implementation: 112 // RenderFrameHostDelegate implementation:
106 virtual void RenderFrameCreated(RenderFrameHost* render_frame_host) OVERRIDE; 113 virtual void RenderFrameCreated(RenderFrameHost* render_frame_host) OVERRIDE;
107 114
108 // RenderViewHostDelegate implementation: 115 // RenderViewHostDelegate implementation:
109 virtual RenderViewHostDelegateView* GetDelegateView() OVERRIDE; 116 virtual RenderViewHostDelegateView* GetDelegateView() OVERRIDE;
110 virtual const GURL& GetURL() const OVERRIDE; 117 virtual const GURL& GetURL() const OVERRIDE;
111 virtual void RenderViewTerminated(RenderViewHost* render_view_host, 118 virtual void RenderViewTerminated(RenderViewHost* render_view_host,
112 base::TerminationStatus status, 119 base::TerminationStatus status,
113 int error_code) OVERRIDE; 120 int error_code) OVERRIDE;
114 virtual void DidNavigate(
115 RenderViewHost* render_view_host,
116 const ViewHostMsg_FrameNavigate_Params& params) OVERRIDE;
117 virtual void UpdateTitle(RenderViewHost* render_view_host, 121 virtual void UpdateTitle(RenderViewHost* render_view_host,
118 int32 page_id, 122 int32 page_id,
119 const base::string16& title, 123 const base::string16& title,
120 base::i18n::TextDirection title_direction) OVERRIDE; 124 base::i18n::TextDirection title_direction) OVERRIDE;
121 virtual RendererPreferences GetRendererPrefs( 125 virtual RendererPreferences GetRendererPrefs(
122 BrowserContext* browser_context) const OVERRIDE; 126 BrowserContext* browser_context) const OVERRIDE;
123 virtual WebPreferences GetWebkitPrefs() OVERRIDE; 127 virtual WebPreferences GetWebkitPrefs() OVERRIDE;
124 virtual gfx::Rect GetRootWindowResizerRect() const OVERRIDE; 128 virtual gfx::Rect GetRootWindowResizerRect() const OVERRIDE;
125 virtual void CreateNewWindow( 129 virtual void CreateNewWindow(
126 int render_process_id, 130 int render_process_id,
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 base::WeakPtrFactory<InterstitialPageImpl> weak_ptr_factory_; 274 base::WeakPtrFactory<InterstitialPageImpl> weak_ptr_factory_;
271 275
272 scoped_refptr<SessionStorageNamespace> session_storage_namespace_; 276 scoped_refptr<SessionStorageNamespace> session_storage_namespace_;
273 277
274 DISALLOW_COPY_AND_ASSIGN(InterstitialPageImpl); 278 DISALLOW_COPY_AND_ASSIGN(InterstitialPageImpl);
275 }; 279 };
276 280
277 } // namespace content 281 } // namespace content
278 282
279 #endif // CONTENT_BROWSER_FRAME_HOST_INTERSTITIAL_PAGE_IMPL_H_ 283 #endif // CONTENT_BROWSER_FRAME_HOST_INTERSTITIAL_PAGE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698