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

Side by Side Diff: chrome/browser/extensions/api/web_navigation/frame_navigation_state.h

Issue 10834125: When committing a provisional load that didn't change the RVH, still abort pending navigations. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: patch for landing Created 8 years, 4 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
« no previous file with comments | « no previous file | chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 CHROME_BROWSER_EXTENSIONS_API_WEB_NAVIGATION_FRAME_NAVIGATION_STATE_H_ 5 #ifndef CHROME_BROWSER_EXTENSIONS_API_WEB_NAVIGATION_FRAME_NAVIGATION_STATE_H_
6 #define CHROME_BROWSER_EXTENSIONS_API_WEB_NAVIGATION_FRAME_NAVIGATION_STATE_H_ 6 #define CHROME_BROWSER_EXTENSIONS_API_WEB_NAVIGATION_FRAME_NAVIGATION_STATE_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 10
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 50
51 // True if in general webNavigation events may be sent for the given URL. 51 // True if in general webNavigation events may be sent for the given URL.
52 bool IsValidUrl(const GURL& url) const; 52 bool IsValidUrl(const GURL& url) const;
53 53
54 // Starts to track a frame identified by its |frame_id| showing the URL |url|. 54 // Starts to track a frame identified by its |frame_id| showing the URL |url|.
55 void TrackFrame(FrameID frame_id, 55 void TrackFrame(FrameID frame_id,
56 const GURL& url, 56 const GURL& url,
57 bool is_main_frame, 57 bool is_main_frame,
58 bool is_error_page); 58 bool is_error_page);
59 59
60 // Stops tracking all frames for a given RenderViewHost. 60 // Stops tracking all frames but the frame with |id_to_skip| for a given
61 void StopTrackingFramesInRVH(content::RenderViewHost* render_view_host); 61 // RenderViewHost.
62 void StopTrackingFramesInRVH(content::RenderViewHost* render_view_host,
63 FrameID id_to_skip);
62 64
63 // Update the URL associated with a given frame. 65 // Update the URL associated with a given frame.
64 void UpdateFrame(FrameID frame_id, const GURL& url); 66 void UpdateFrame(FrameID frame_id, const GURL& url);
65 67
66 // Returns true if |frame_id| is a known frame. 68 // Returns true if |frame_id| is a known frame.
67 bool IsValidFrame(FrameID frame_id) const; 69 bool IsValidFrame(FrameID frame_id) const;
68 70
69 // Returns the URL corresponding to a tracked frame given by its |frame_id|. 71 // Returns the URL corresponding to a tracked frame given by its |frame_id|.
70 GURL GetUrl(FrameID frame_id) const; 72 GURL GetUrl(FrameID frame_id) const;
71 73
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 134
133 // If true, also allow events from chrome-extension:// URLs. 135 // If true, also allow events from chrome-extension:// URLs.
134 static bool allow_extension_scheme_; 136 static bool allow_extension_scheme_;
135 137
136 DISALLOW_COPY_AND_ASSIGN(FrameNavigationState); 138 DISALLOW_COPY_AND_ASSIGN(FrameNavigationState);
137 }; 139 };
138 140
139 } // namespace extensions 141 } // namespace extensions
140 142
141 #endif // CHROME_BROWSER_EXTENSIONS_API_WEB_NAVIGATION_FRAME_NAVIGATION_STATE_H _ 143 #endif // CHROME_BROWSER_EXTENSIONS_API_WEB_NAVIGATION_FRAME_NAVIGATION_STATE_H _
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698