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

Side by Side Diff: content/public/browser/navigation_controller.h

Issue 1440573003: Remove ScopedVector from NavigationController. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixes Created 5 years, 1 month 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 (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 CONTENT_PUBLIC_BROWSER_NAVIGATION_CONTROLLER_H_ 5 #ifndef CONTENT_PUBLIC_BROWSER_NAVIGATION_CONTROLLER_H_
6 #define CONTENT_PUBLIC_BROWSER_NAVIGATION_CONTROLLER_H_ 6 #define CONTENT_PUBLIC_BROWSER_NAVIGATION_CONTROLLER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/memory/ref_counted.h" 12 #include "base/memory/ref_counted.h"
13 #include "base/memory/scoped_vector.h"
14 #include "base/strings/string16.h" 13 #include "base/strings/string16.h"
15 #include "content/common/content_export.h" 14 #include "content/common/content_export.h"
16 #include "content/public/browser/global_request_id.h" 15 #include "content/public/browser/global_request_id.h"
17 #include "content/public/browser/session_storage_namespace.h" 16 #include "content/public/browser/session_storage_namespace.h"
18 #include "content/public/browser/site_instance.h" 17 #include "content/public/browser/site_instance.h"
19 #include "content/public/common/referrer.h" 18 #include "content/public/common/referrer.h"
20 #include "ui/base/page_transition_types.h" 19 #include "ui/base/page_transition_types.h"
21 #include "url/gurl.h" 20 #include "url/gurl.h"
22 21
23 namespace base { 22 namespace base {
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 virtual void SetBrowserContext(BrowserContext* browser_context) = 0; 219 virtual void SetBrowserContext(BrowserContext* browser_context) = 0;
221 220
222 // Initializes this NavigationController with the given saved navigations, 221 // Initializes this NavigationController with the given saved navigations,
223 // using |selected_navigation| as the currently loaded entry. Before this call 222 // using |selected_navigation| as the currently loaded entry. Before this call
224 // the controller should be unused (there should be no current entry). |type| 223 // the controller should be unused (there should be no current entry). |type|
225 // indicates where the restor comes from. This takes ownership of the 224 // indicates where the restor comes from. This takes ownership of the
226 // NavigationEntrys in |entries| and clears it out. This is used for session 225 // NavigationEntrys in |entries| and clears it out. This is used for session
227 // restore. 226 // restore.
228 virtual void Restore(int selected_navigation, 227 virtual void Restore(int selected_navigation,
229 RestoreType type, 228 RestoreType type,
230 ScopedVector<NavigationEntry>* entries) = 0; 229 std::vector<scoped_ptr<NavigationEntry>>* entries) = 0;
231 230
232 // Entries ------------------------------------------------------------------- 231 // Entries -------------------------------------------------------------------
233 232
234 // There are two basic states for entries: pending and committed. When an 233 // There are two basic states for entries: pending and committed. When an
235 // entry is navigated to, a request is sent to the server. While that request 234 // entry is navigated to, a request is sent to the server. While that request
236 // has not been responded to, the NavigationEntry is pending. Once data is 235 // has not been responded to, the NavigationEntry is pending. Once data is
237 // received for that entry, that NavigationEntry is committed. 236 // received for that entry, that NavigationEntry is committed.
238 237
239 // A transient entry is an entry that, when the user navigates away, is 238 // A transient entry is an entry that, when the user navigates away, is
240 // removed and discarded rather than being added to the back-forward list. 239 // removed and discarded rather than being added to the back-forward list.
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
476 475
477 private: 476 private:
478 // This interface should only be implemented inside content. 477 // This interface should only be implemented inside content.
479 friend class NavigationControllerImpl; 478 friend class NavigationControllerImpl;
480 NavigationController() {} 479 NavigationController() {}
481 }; 480 };
482 481
483 } // namespace content 482 } // namespace content
484 483
485 #endif // CONTENT_PUBLIC_BROWSER_NAVIGATION_CONTROLLER_H_ 484 #endif // CONTENT_PUBLIC_BROWSER_NAVIGATION_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698