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

Unified Diff: content/renderer/history_controller.h

Issue 1873783003: Convert //content/renderer from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/gpu/render_widget_compositor_unittest.cc ('k') | content/renderer/history_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/history_controller.h
diff --git a/content/renderer/history_controller.h b/content/renderer/history_controller.h
index 7787efb9d75ec7bf8c9fcb834c393ea77d2fb18a..ff20596701492e50adce619e98005bbf8c8c0b84 100644
--- a/content/renderer/history_controller.h
+++ b/content/renderer/history_controller.h
@@ -35,11 +35,11 @@
#ifndef CONTENT_RENDERER_HISTORY_CONTROLLER_H_
#define CONTENT_RENDERER_HISTORY_CONTROLLER_H_
+#include <memory>
#include <utility>
#include "base/containers/hash_tables.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "content/common/content_export.h"
#include "content/renderer/history_entry.h"
#include "third_party/WebKit/public/web/WebHistoryCommitType.h"
@@ -113,15 +113,15 @@ class CONTENT_EXPORT HistoryController {
explicit HistoryController(RenderViewImpl* render_view);
~HistoryController();
- void set_provisional_entry(scoped_ptr<HistoryEntry> entry) {
+ void set_provisional_entry(std::unique_ptr<HistoryEntry> entry) {
provisional_entry_ = std::move(entry);
}
// Return true if the main frame ended up loading a request as part of the
// history navigation.
bool GoToEntry(blink::WebLocalFrame* main_frame,
- scoped_ptr<HistoryEntry> entry,
- scoped_ptr<NavigationParams> navigation_params,
+ std::unique_ptr<HistoryEntry> entry,
+ std::unique_ptr<NavigationParams> navigation_params,
blink::WebCachePolicy cache_policy);
void UpdateForCommit(RenderFrameImpl* frame,
@@ -149,16 +149,16 @@ class CONTENT_EXPORT HistoryController {
RenderViewImpl* render_view_;
// A HistoryEntry representing the currently-loaded page.
- scoped_ptr<HistoryEntry> current_entry_;
+ std::unique_ptr<HistoryEntry> current_entry_;
// A HistoryEntry representing the page that is being loaded, or an empty
// scoped_ptr if no page is being loaded.
- scoped_ptr<HistoryEntry> provisional_entry_;
+ std::unique_ptr<HistoryEntry> provisional_entry_;
// The NavigationParams corresponding to the last load that was initiated by
// |GoToEntry|. This is kept around so that it can be passed into existing
// frames modified during a history navigation in GoToEntry(), and can be
// passed into frames created after the commit that resulted from the
// navigation in GetItemForNewChildFrame().
- scoped_ptr<NavigationParams> navigation_params_;
+ std::unique_ptr<NavigationParams> navigation_params_;
DISALLOW_COPY_AND_ASSIGN(HistoryController);
};
« no previous file with comments | « content/renderer/gpu/render_widget_compositor_unittest.cc ('k') | content/renderer/history_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698