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

Side by Side Diff: ios/web/navigation/navigation_manager_impl.h

Issue 2798813002: Revert of Set user agent type of transient item the same as pending item. (Closed)
Patch Set: Created 3 years, 8 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
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 IOS_WEB_NAVIGATION_NAVIGATION_MANAGER_IMPL_H_ 5 #ifndef IOS_WEB_NAVIGATION_NAVIGATION_MANAGER_IMPL_H_
6 #define IOS_WEB_NAVIGATION_NAVIGATION_MANAGER_IMPL_H_ 6 #define IOS_WEB_NAVIGATION_NAVIGATION_MANAGER_IMPL_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 void OnNavigationItemCommitted(); 88 void OnNavigationItemCommitted();
89 89
90 // Temporary accessors and content/ class pass-throughs. 90 // Temporary accessors and content/ class pass-throughs.
91 // TODO(stuartmorgan): Re-evaluate this list once the refactorings have 91 // TODO(stuartmorgan): Re-evaluate this list once the refactorings have
92 // settled down. 92 // settled down.
93 CRWSessionController* GetSessionController(); 93 CRWSessionController* GetSessionController();
94 void LoadURL(const GURL& url, 94 void LoadURL(const GURL& url,
95 const Referrer& referrer, 95 const Referrer& referrer,
96 ui::PageTransition type); 96 ui::PageTransition type);
97 97
98 // Adds a transient item with the given URL. A transient item will be
99 // discarded on any navigation.
100 void AddTransientItem(const GURL& url);
101
102 // Adds a new item with the given url, referrer, navigation type, initiation 98 // Adds a new item with the given url, referrer, navigation type, initiation
103 // type and user agent override option, making it the pending item. If pending 99 // type and user agent override option, making it the pending item. If pending
104 // item is the same as the current item, this does nothing. |referrer| may be 100 // item is the same as the current item, this does nothing. |referrer| may be
105 // nil if there isn't one. The item starts out as pending, and will be lost 101 // nil if there isn't one. The item starts out as pending, and will be lost
106 // unless |-commitPendingItem| is called. 102 // unless |-commitPendingItem| is called.
107 void AddPendingItem(const GURL& url, 103 void AddPendingItem(const GURL& url,
108 const web::Referrer& referrer, 104 const web::Referrer& referrer,
109 ui::PageTransition navigation_type, 105 ui::PageTransition navigation_type,
110 NavigationInitiationType initiation_type, 106 NavigationInitiationType initiation_type,
111 UserAgentOverrideOption user_agent_override_option); 107 UserAgentOverrideOption user_agent_override_option);
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 // List of transient url rewriters added by |AddTransientURLRewriter()|. 186 // List of transient url rewriters added by |AddTransientURLRewriter()|.
191 std::unique_ptr<std::vector<BrowserURLRewriter::URLRewriter>> 187 std::unique_ptr<std::vector<BrowserURLRewriter::URLRewriter>>
192 transient_url_rewriters_; 188 transient_url_rewriters_;
193 189
194 DISALLOW_COPY_AND_ASSIGN(NavigationManagerImpl); 190 DISALLOW_COPY_AND_ASSIGN(NavigationManagerImpl);
195 }; 191 };
196 192
197 } // namespace web 193 } // namespace web
198 194
199 #endif // IOS_WEB_NAVIGATION_NAVIGATION_MANAGER_IMPL_H_ 195 #endif // IOS_WEB_NAVIGATION_NAVIGATION_MANAGER_IMPL_H_
OLDNEW
« no previous file with comments | « ios/web/interstitials/web_interstitial_impl.mm ('k') | ios/web/navigation/navigation_manager_impl.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698