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

Side by Side Diff: content/browser/web_contents/web_contents_impl.h

Issue 26316005: Move out DidStartProvisionalLoad from WebContentsImpl into Navigator. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixes based on Charlie's latest review. 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
293 virtual const GURL& GetVisibleURL() const OVERRIDE; 293 virtual const GURL& GetVisibleURL() const OVERRIDE;
294 virtual const GURL& GetLastCommittedURL() const OVERRIDE; 294 virtual const GURL& GetLastCommittedURL() const OVERRIDE;
295 virtual WebContents* GetAsWebContents() OVERRIDE; 295 virtual WebContents* GetAsWebContents() OVERRIDE;
296 virtual gfx::Rect GetRootWindowResizerRect() const OVERRIDE; 296 virtual gfx::Rect GetRootWindowResizerRect() const OVERRIDE;
297 virtual void RenderViewCreated(RenderViewHost* render_view_host) OVERRIDE; 297 virtual void RenderViewCreated(RenderViewHost* render_view_host) OVERRIDE;
298 virtual void RenderViewReady(RenderViewHost* render_view_host) OVERRIDE; 298 virtual void RenderViewReady(RenderViewHost* render_view_host) OVERRIDE;
299 virtual void RenderViewTerminated(RenderViewHost* render_view_host, 299 virtual void RenderViewTerminated(RenderViewHost* render_view_host,
300 base::TerminationStatus status, 300 base::TerminationStatus status,
301 int error_code) OVERRIDE; 301 int error_code) OVERRIDE;
302 virtual void RenderViewDeleted(RenderViewHost* render_view_host) OVERRIDE; 302 virtual void RenderViewDeleted(RenderViewHost* render_view_host) OVERRIDE;
303 virtual void DidStartProvisionalLoadForFrame(
304 RenderViewHost* render_view_host,
305 int64 frame_id,
306 int64 parent_frame_id,
307 bool main_frame,
308 const GURL& url) OVERRIDE;
309 virtual void DidRedirectProvisionalLoad( 303 virtual void DidRedirectProvisionalLoad(
310 RenderViewHost* render_view_host, 304 RenderViewHost* render_view_host,
311 int32 page_id, 305 int32 page_id,
312 const GURL& source_url, 306 const GURL& source_url,
313 const GURL& target_url) OVERRIDE; 307 const GURL& target_url) OVERRIDE;
314 virtual void DidFailProvisionalLoadWithError( 308 virtual void DidFailProvisionalLoadWithError(
315 RenderViewHost* render_view_host, 309 RenderViewHost* render_view_host,
316 const ViewHostMsg_DidFailProvisionalLoadWithError_Params& params) 310 const ViewHostMsg_DidFailProvisionalLoadWithError_Params& params)
317 OVERRIDE; 311 OVERRIDE;
318 virtual void DidGetResourceResponseStart( 312 virtual void DidGetResourceResponseStart(
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
433 const gfx::Rect& initial_pos) OVERRIDE; 427 const gfx::Rect& initial_pos) OVERRIDE;
434 virtual void ShowCreatedFullscreenWidget(int route_id) OVERRIDE; 428 virtual void ShowCreatedFullscreenWidget(int route_id) OVERRIDE;
435 virtual void ShowContextMenu(const ContextMenuParams& params) OVERRIDE; 429 virtual void ShowContextMenu(const ContextMenuParams& params) OVERRIDE;
436 virtual void RequestMediaAccessPermission( 430 virtual void RequestMediaAccessPermission(
437 const MediaStreamRequest& request, 431 const MediaStreamRequest& request,
438 const MediaResponseCallback& callback) OVERRIDE; 432 const MediaResponseCallback& callback) OVERRIDE;
439 virtual SessionStorageNamespace* GetSessionStorageNamespace( 433 virtual SessionStorageNamespace* GetSessionStorageNamespace(
440 SiteInstance* instance) OVERRIDE; 434 SiteInstance* instance) OVERRIDE;
441 virtual FrameTree* GetFrameTree() OVERRIDE; 435 virtual FrameTree* GetFrameTree() OVERRIDE;
442 436
437 // NavigatorDelegate ---------------------------------------------------------
438
439 virtual void DidStartProvisionalLoad(
440 RenderFrameHostImpl* render_frame_host,
441 int64 frame_id,
442 int64 parent_frame_id,
443 bool is_main_frame,
444 const GURL& validated_url,
445 bool is_error_page,
446 bool is_iframe_srcdoc) OVERRIDE;
447 virtual void NotifyChangedNavigationState(
448 InvalidateTypes changed_flags) OVERRIDE;
449
443 // RenderWidgetHostDelegate -------------------------------------------------- 450 // RenderWidgetHostDelegate --------------------------------------------------
444 451
445 virtual void RenderWidgetDeleted( 452 virtual void RenderWidgetDeleted(
446 RenderWidgetHostImpl* render_widget_host) OVERRIDE; 453 RenderWidgetHostImpl* render_widget_host) OVERRIDE;
447 virtual bool PreHandleKeyboardEvent( 454 virtual bool PreHandleKeyboardEvent(
448 const NativeWebKeyboardEvent& event, 455 const NativeWebKeyboardEvent& event,
449 bool* is_keyboard_shortcut) OVERRIDE; 456 bool* is_keyboard_shortcut) OVERRIDE;
450 virtual void HandleKeyboardEvent( 457 virtual void HandleKeyboardEvent(
451 const NativeWebKeyboardEvent& event) OVERRIDE; 458 const NativeWebKeyboardEvent& event) OVERRIDE;
452 virtual bool PreHandleWheelEvent( 459 virtual bool PreHandleWheelEvent(
(...skipping 553 matching lines...) Expand 10 before | Expand all | Expand 10 after
1006 // Maps the ids of pending image downloads to their callbacks 1013 // Maps the ids of pending image downloads to their callbacks
1007 typedef std::map<int, ImageDownloadCallback> ImageDownloadMap; 1014 typedef std::map<int, ImageDownloadCallback> ImageDownloadMap;
1008 ImageDownloadMap image_download_map_; 1015 ImageDownloadMap image_download_map_;
1009 1016
1010 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl); 1017 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);
1011 }; 1018 };
1012 1019
1013 } // namespace content 1020 } // namespace content
1014 1021
1015 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 1022 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_view_host_impl.cc ('k') | content/browser/web_contents/web_contents_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698