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

Side by Side Diff: content/public/renderer/document_state.h

Issue 1874903002: Convert //content from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix indent 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
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_RENDERER_DOCUMENT_STATE_H_ 5 #ifndef CONTENT_PUBLIC_RENDERER_DOCUMENT_STATE_H_
6 #define CONTENT_PUBLIC_RENDERER_DOCUMENT_STATE_H_ 6 #define CONTENT_PUBLIC_RENDERER_DOCUMENT_STATE_H_
7 7
8 #include <memory>
8 #include <string> 9 #include <string>
9 10
10 #include "base/logging.h" 11 #include "base/logging.h"
11 #include "base/memory/scoped_ptr.h"
12 #include "base/supports_user_data.h" 12 #include "base/supports_user_data.h"
13 #include "base/time/time.h" 13 #include "base/time/time.h"
14 #include "content/common/content_export.h" 14 #include "content/common/content_export.h"
15 #include "net/http/http_response_info.h" 15 #include "net/http/http_response_info.h"
16 #include "third_party/WebKit/public/web/WebDataSource.h" 16 #include "third_party/WebKit/public/web/WebDataSource.h"
17 #include "url/gurl.h" 17 #include "url/gurl.h"
18 18
19 namespace content { 19 namespace content {
20 20
21 class NavigationState; 21 class NavigationState;
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 // A prefetcher is a page that contains link rel=prefetch elements. 232 // A prefetcher is a page that contains link rel=prefetch elements.
233 bool was_prefetcher_; 233 bool was_prefetcher_;
234 bool was_referred_by_prefetcher_; 234 bool was_referred_by_prefetcher_;
235 bool was_after_preconnect_request_; 235 bool was_after_preconnect_request_;
236 236
237 bool was_load_data_with_base_url_request_; 237 bool was_load_data_with_base_url_request_;
238 GURL data_url_; 238 GURL data_url_;
239 239
240 LoadType load_type_; 240 LoadType load_type_;
241 241
242 scoped_ptr<NavigationState> navigation_state_; 242 std::unique_ptr<NavigationState> navigation_state_;
243 243
244 bool can_load_local_resources_; 244 bool can_load_local_resources_;
245 }; 245 };
246 246
247 #endif // CONTENT_PUBLIC_RENDERER_DOCUMENT_STATE_H_ 247 #endif // CONTENT_PUBLIC_RENDERER_DOCUMENT_STATE_H_
248 248
249 } // namespace content 249 } // namespace content
OLDNEW
« no previous file with comments | « content/public/renderer/content_renderer_client.cc ('k') | content/public/renderer/media_stream_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698