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

Unified Diff: mash/task_viewer/task_viewer.cc

Issue 1857623003: convert //mash to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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 | « mash/task_viewer/task_viewer.h ('k') | mash/wm/accelerator_registrar_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/task_viewer/task_viewer.cc
diff --git a/mash/task_viewer/task_viewer.cc b/mash/task_viewer/task_viewer.cc
index 6e3b018b7462dd9ec4820341b938a5045fe120a6..754d54eaff74cab179acc356bf072a20cf85df9d 100644
--- a/mash/task_viewer/task_viewer.cc
+++ b/mash/task_viewer/task_viewer.cc
@@ -9,6 +9,7 @@
#include "base/bind.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/memory/weak_ptr.h"
#include "base/process/process.h"
#include "base/strings/string_number_conversions.h"
@@ -203,7 +204,7 @@ class TaskViewerContents : public views::WidgetDelegateView,
}
void InsertInstance(uint32_t id, const std::string& url, uint32_t pid) {
- instances_.push_back(make_scoped_ptr(new InstanceInfo(id, url, pid)));
+ instances_.push_back(base::WrapUnique(new InstanceInfo(id, url, pid)));
}
void OnGotCatalogEntries(
@@ -258,7 +259,7 @@ class TaskViewerContents : public views::WidgetDelegateView,
views::LabelButton* kill_button_;
ui::TableModelObserver* observer_;
- std::vector<scoped_ptr<InstanceInfo>> instances_;
+ std::vector<std::unique_ptr<InstanceInfo>> instances_;
base::WeakPtrFactory<TaskViewerContents> weak_ptr_factory_;
« no previous file with comments | « mash/task_viewer/task_viewer.h ('k') | mash/wm/accelerator_registrar_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698