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

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

Issue 746993003: Only cancel navigation on user gesture (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: documentation and style fixes 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_MANAGER_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_
6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_
7 7
8 #include <list> 8 #include <list>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
281 const GlobalRequestID& global_request_id, 281 const GlobalRequestID& global_request_id,
282 RenderFrameHostImpl* pending_render_frame_host); 282 RenderFrameHostImpl* pending_render_frame_host);
283 283
284 // Resume navigation paused after receiving response headers. 284 // Resume navigation paused after receiving response headers.
285 void ResumeResponseDeferredAtStart(); 285 void ResumeResponseDeferredAtStart();
286 286
287 // Clear navigation transition data. 287 // Clear navigation transition data.
288 void ClearNavigationTransitionData(); 288 void ClearNavigationTransitionData();
289 289
290 // Called when a renderer's frame navigates. 290 // Called when a renderer's frame navigates.
291 void DidNavigateFrame(RenderFrameHostImpl* render_frame_host); 291 void DidNavigateFrame(RenderFrameHostImpl* render_frame_host,
292 bool was_caused_by_user_gesture);
292 293
293 // Called when a renderer sets its opener to null. 294 // Called when a renderer sets its opener to null.
294 void DidDisownOpener(RenderFrameHost* render_frame_host); 295 void DidDisownOpener(RenderFrameHost* render_frame_host);
295 296
296 // Sets the pending Web UI for the pending navigation, ensuring that the 297 // Sets the pending Web UI for the pending navigation, ensuring that the
297 // bindings are appropriate compared to |bindings|. 298 // bindings are appropriate compared to |bindings|.
298 void SetPendingWebUI(const GURL& url, int bindings); 299 void SetPendingWebUI(const GURL& url, int bindings);
299 300
300 // Creates and initializes a RenderFrameHost. The |web_ui| is an optional 301 // Creates and initializes a RenderFrameHost. The |web_ui| is an optional
301 // input parameter used to double check bindings when swapping back in a 302 // input parameter used to double check bindings when swapping back in a
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
601 NotificationRegistrar registrar_; 602 NotificationRegistrar registrar_;
602 603
603 base::WeakPtrFactory<RenderFrameHostManager> weak_factory_; 604 base::WeakPtrFactory<RenderFrameHostManager> weak_factory_;
604 605
605 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManager); 606 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManager);
606 }; 607 };
607 608
608 } // namespace content 609 } // namespace content
609 610
610 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_ 611 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_
OLDNEW
« no previous file with comments | « content/browser/frame_host/navigator_impl.cc ('k') | content/browser/frame_host/render_frame_host_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698