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

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

Issue 790843002: If the renderer drops a navigation, make sure the spinner doesn't spin endlessly. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: test Created 6 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
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_IMPL_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 403 matching lines...) Expand 10 before | Expand all | Expand 10 after
414 void OnDocumentOnLoadCompleted(); 414 void OnDocumentOnLoadCompleted();
415 void OnDidStartProvisionalLoadForFrame(const GURL& url, 415 void OnDidStartProvisionalLoadForFrame(const GURL& url,
416 bool is_transition_navigation); 416 bool is_transition_navigation);
417 void OnDidFailProvisionalLoadWithError( 417 void OnDidFailProvisionalLoadWithError(
418 const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params); 418 const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params);
419 void OnDidFailLoadWithError( 419 void OnDidFailLoadWithError(
420 const GURL& url, 420 const GURL& url,
421 int error_code, 421 int error_code,
422 const base::string16& error_description); 422 const base::string16& error_description);
423 void OnDidCommitProvisionalLoad(const IPC::Message& msg); 423 void OnDidCommitProvisionalLoad(const IPC::Message& msg);
424 void OnDidDropNavigation();
424 void OnBeforeUnloadACK( 425 void OnBeforeUnloadACK(
425 bool proceed, 426 bool proceed,
426 const base::TimeTicks& renderer_before_unload_start_time, 427 const base::TimeTicks& renderer_before_unload_start_time,
427 const base::TimeTicks& renderer_before_unload_end_time); 428 const base::TimeTicks& renderer_before_unload_end_time);
428 void OnSwapOutACK(); 429 void OnSwapOutACK();
429 void OnContextMenu(const ContextMenuParams& params); 430 void OnContextMenu(const ContextMenuParams& params);
430 void OnJavaScriptExecuteResponse(int id, const base::ListValue& result); 431 void OnJavaScriptExecuteResponse(int id, const base::ListValue& result);
431 void OnRunJavaScriptMessage(const base::string16& message, 432 void OnRunJavaScriptMessage(const base::string16& message,
432 const base::string16& default_prompt, 433 const base::string16& default_prompt,
433 const GURL& frame_url, 434 const GURL& frame_url,
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
609 610
610 // NOTE: This must be the last member. 611 // NOTE: This must be the last member.
611 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_; 612 base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_;
612 613
613 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl); 614 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl);
614 }; 615 };
615 616
616 } // namespace content 617 } // namespace content
617 618
618 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_ 619 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
OLDNEW
« no previous file with comments | « content/browser/frame_host/render_frame_host_delegate.h ('k') | content/browser/frame_host/render_frame_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698