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

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

Issue 2704663004: Remove CRWSessionEntry from NavigationManagerImpl. (Closed)
Patch Set: Added size_t todos Created 3 years, 10 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
« no previous file with comments | « no previous file | ios/web/navigation/navigation_manager_impl.mm » ('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 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>
11 #include <vector> 11 #include <vector>
12 12
13 #import "base/mac/scoped_nsobject.h" 13 #import "base/mac/scoped_nsobject.h"
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #import "ios/web/public/navigation_item_list.h"
15 #import "ios/web/public/navigation_manager.h" 16 #import "ios/web/public/navigation_manager.h"
16 #include "ui/base/page_transition_types.h" 17 #include "ui/base/page_transition_types.h"
17 #include "url/gurl.h" 18 #include "url/gurl.h"
18 19
19 @class CRWSessionController; 20 @class CRWSessionController;
20 21
21 namespace web { 22 namespace web {
22 class BrowserState; 23 class BrowserState;
23 class NavigationItem; 24 class NavigationItem;
24 struct Referrer; 25 struct Referrer;
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 // Convenience accessors to get the underlying NavigationItems from the 114 // Convenience accessors to get the underlying NavigationItems from the
114 // SessionEntries returned from |session_controller_|'s -lastUserEntry and 115 // SessionEntries returned from |session_controller_|'s -lastUserEntry and
115 // -previousEntry methods. 116 // -previousEntry methods.
116 // TODO(crbug.com/546365): Remove these methods. 117 // TODO(crbug.com/546365): Remove these methods.
117 NavigationItem* GetLastUserItem() const; 118 NavigationItem* GetLastUserItem() const;
118 NavigationItem* GetPreviousItem() const; 119 NavigationItem* GetPreviousItem() const;
119 120
120 // Temporary method. Returns a vector of NavigationItems corresponding to 121 // Temporary method. Returns a vector of NavigationItems corresponding to
121 // the SessionEntries of the uderlying CRWSessionController. 122 // the SessionEntries of the uderlying CRWSessionController.
122 // TODO(crbug.com/546365): Remove this method. 123 // TODO(crbug.com/546365): Remove this method.
123 std::vector<NavigationItem*> GetItems(); 124 NavigationItemList GetItems() const;
124 125
125 // NavigationManager: 126 // NavigationManager:
126 BrowserState* GetBrowserState() const override; 127 BrowserState* GetBrowserState() const override;
127 WebState* GetWebState() const override; 128 WebState* GetWebState() const override;
128 NavigationItem* GetVisibleItem() const override; 129 NavigationItem* GetVisibleItem() const override;
129 NavigationItem* GetLastCommittedItem() const override; 130 NavigationItem* GetLastCommittedItem() const override;
130 NavigationItem* GetPendingItem() const override; 131 NavigationItem* GetPendingItem() const override;
131 NavigationItem* GetTransientItem() const override; 132 NavigationItem* GetTransientItem() const override;
132 void DiscardNonCommittedItems() override; 133 void DiscardNonCommittedItems() override;
133 void LoadIfNecessary() override; 134 void LoadIfNecessary() override;
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 // List of transient url rewriters added by |AddTransientURLRewriter()|. 202 // List of transient url rewriters added by |AddTransientURLRewriter()|.
202 std::unique_ptr<std::vector<BrowserURLRewriter::URLRewriter>> 203 std::unique_ptr<std::vector<BrowserURLRewriter::URLRewriter>>
203 transient_url_rewriters_; 204 transient_url_rewriters_;
204 205
205 DISALLOW_COPY_AND_ASSIGN(NavigationManagerImpl); 206 DISALLOW_COPY_AND_ASSIGN(NavigationManagerImpl);
206 }; 207 };
207 208
208 } // namespace web 209 } // namespace web
209 210
210 #endif // IOS_WEB_NAVIGATION_NAVIGATION_MANAGER_IMPL_H_ 211 #endif // IOS_WEB_NAVIGATION_NAVIGATION_MANAGER_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | ios/web/navigation/navigation_manager_impl.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698