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

Side by Side Diff: ios/web/public/navigation_item.h

Issue 1861593005: Convert //ios from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase? Created 4 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
« no previous file with comments | « ios/web/public/interstitials/web_interstitial.h ('k') | ios/web/public/test/http_server.h » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_PUBLIC_NAVIGATION_ITEM_H_ 5 #ifndef IOS_WEB_PUBLIC_NAVIGATION_ITEM_H_
6 #define IOS_WEB_PUBLIC_NAVIGATION_ITEM_H_ 6 #define IOS_WEB_PUBLIC_NAVIGATION_ITEM_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include <memory>
9
9 #include "base/strings/string16.h" 10 #include "base/strings/string16.h"
10 #include "base/supports_user_data.h" 11 #include "base/supports_user_data.h"
11 #include "base/time/time.h" 12 #include "base/time/time.h"
12 #include "ios/web/public/web_state/page_display_state.h" 13 #include "ios/web/public/web_state/page_display_state.h"
13 #include "ui/base/page_transition_types.h" 14 #include "ui/base/page_transition_types.h"
14 15
15 class GURL; 16 class GURL;
16 17
17 @class NSDictionary; 18 @class NSDictionary;
18 19
19 namespace web { 20 namespace web {
20 struct FaviconStatus; 21 struct FaviconStatus;
21 struct Referrer; 22 struct Referrer;
22 struct SSLStatus; 23 struct SSLStatus;
23 24
24 // A NavigationItem is a data structure that captures all the information 25 // A NavigationItem is a data structure that captures all the information
25 // required to recreate a browsing state. It represents one point in the 26 // required to recreate a browsing state. It represents one point in the
26 // chain of navigation managed by a NavigationManager. 27 // chain of navigation managed by a NavigationManager.
27 class NavigationItem : public base::SupportsUserData { 28 class NavigationItem : public base::SupportsUserData {
28 public: 29 public:
29 // Creates a new NavigationItem. 30 // Creates a new NavigationItem.
30 static scoped_ptr<NavigationItem> Create(); 31 static std::unique_ptr<NavigationItem> Create();
31 32
32 // Page-related stuff -------------------------------------------------------- 33 // Page-related stuff --------------------------------------------------------
33 34
34 // A unique ID is preserved across commits and redirects, which means that 35 // A unique ID is preserved across commits and redirects, which means that
35 // sometimes a NavigationEntry's unique ID needs to be set (e.g. when 36 // sometimes a NavigationEntry's unique ID needs to be set (e.g. when
36 // creating a committed entry to correspond to a to-be-deleted pending entry, 37 // creating a committed entry to correspond to a to-be-deleted pending entry,
37 // the pending entry's ID must be copied). 38 // the pending entry's ID must be copied).
38 virtual int GetUniqueID() const = 0; 39 virtual int GetUniqueID() const = 0;
39 40
40 // The actual URL of the page. For some about pages, this may be a scary 41 // The actual URL of the page. For some about pages, this may be a scary
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 virtual NSDictionary* GetHttpRequestHeaders() const = 0; 120 virtual NSDictionary* GetHttpRequestHeaders() const = 0;
120 121
121 // Adds headers from |additional_headers| to the item's http request headers. 122 // Adds headers from |additional_headers| to the item's http request headers.
122 // Existing headers with the same key will be overridden. 123 // Existing headers with the same key will be overridden.
123 virtual void AddHttpRequestHeaders(NSDictionary* additional_headers) = 0; 124 virtual void AddHttpRequestHeaders(NSDictionary* additional_headers) = 0;
124 }; 125 };
125 126
126 } // namespace web 127 } // namespace web
127 128
128 #endif // IOS_WEB_PUBLIC_NAVIGATION_ITEM_H_ 129 #endif // IOS_WEB_PUBLIC_NAVIGATION_ITEM_H_
OLDNEW
« no previous file with comments | « ios/web/public/interstitials/web_interstitial.h ('k') | ios/web/public/test/http_server.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698