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

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

Issue 26316005: Move out DidStartProvisionalLoad from WebContentsImpl into Navigator. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Some cleanup. Created 7 years 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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 virtual void Show() OVERRIDE; 60 virtual void Show() OVERRIDE;
61 virtual void Hide() OVERRIDE; 61 virtual void Hide() OVERRIDE;
62 virtual void DontProceed() OVERRIDE; 62 virtual void DontProceed() OVERRIDE;
63 virtual void Proceed() OVERRIDE; 63 virtual void Proceed() OVERRIDE;
64 virtual RenderViewHost* GetRenderViewHostForTesting() const OVERRIDE; 64 virtual RenderViewHost* GetRenderViewHostForTesting() const OVERRIDE;
65 virtual InterstitialPageDelegate* GetDelegateForTesting() OVERRIDE; 65 virtual InterstitialPageDelegate* GetDelegateForTesting() OVERRIDE;
66 virtual void DontCreateViewForTesting() OVERRIDE; 66 virtual void DontCreateViewForTesting() OVERRIDE;
67 virtual void SetSize(const gfx::Size& size) OVERRIDE; 67 virtual void SetSize(const gfx::Size& size) OVERRIDE;
68 virtual void Focus() OVERRIDE; 68 virtual void Focus() OVERRIDE;
69 69
70 // NavigatorDelegate implementation
71 virtual void DidStartProvisionalLoad(
Charlie Reis 2013/11/21 21:59:32 We shouldn't need these. See my comment in naviga
nasko 2013/11/22 01:02:34 Done.
72 RenderFrameHostImpl* render_frame_host,
73 int64 frame_id,
74 int64 parent_frame_id,
75 bool is_main_frame,
76 const GURL& validated_url,
77 bool is_error_page,
78 bool is_iframe_srcdoc) OVERRIDE;
79 virtual void NotifyProvisionalChangeToMainFrameUrl(
80 RenderFrameHostImpl* render_frame_host,
81 const GURL& url) OVERRIDE;
82 virtual void NotifyNavigationStateChanged(unsigned changed_flags) OVERRIDE;
83
70 // Allows the user to navigate away by disabling the interstitial, canceling 84 // Allows the user to navigate away by disabling the interstitial, canceling
71 // the pending request, and unblocking the hidden renderer. The interstitial 85 // the pending request, and unblocking the hidden renderer. The interstitial
72 // will stay visible until the navigation completes. 86 // will stay visible until the navigation completes.
73 void CancelForNavigation(); 87 void CancelForNavigation();
74 88
75 // Focus the first (last if reverse is true) element in the interstitial page. 89 // Focus the first (last if reverse is true) element in the interstitial page.
76 // Called when tab traversing. 90 // Called when tab traversing.
77 void FocusThroughTabTraversal(bool reverse); 91 void FocusThroughTabTraversal(bool reverse);
78 92
79 RenderWidgetHostView* GetView(); 93 RenderWidgetHostView* GetView();
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 base::WeakPtrFactory<InterstitialPageImpl> weak_ptr_factory_; 275 base::WeakPtrFactory<InterstitialPageImpl> weak_ptr_factory_;
262 276
263 scoped_refptr<SessionStorageNamespace> session_storage_namespace_; 277 scoped_refptr<SessionStorageNamespace> session_storage_namespace_;
264 278
265 DISALLOW_COPY_AND_ASSIGN(InterstitialPageImpl); 279 DISALLOW_COPY_AND_ASSIGN(InterstitialPageImpl);
266 }; 280 };
267 281
268 } // namespace content 282 } // namespace content
269 283
270 #endif // CONTENT_BROWSER_FRAME_HOST_INTERSTITIAL_PAGE_IMPL_H_ 284 #endif // CONTENT_BROWSER_FRAME_HOST_INTERSTITIAL_PAGE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698