| Index: chrome/browser/ui/views/task_manager_view.cc
|
| diff --git a/chrome/browser/ui/views/task_manager_view.cc b/chrome/browser/ui/views/task_manager_view.cc
|
| index b7807715c1ce88490b84afcb5228d1557acb8d45..e5b87230a69cd7ae12b2e2bc43ddccf03c365e9f 100644
|
| --- a/chrome/browser/ui/views/task_manager_view.cc
|
| +++ b/chrome/browser/ui/views/task_manager_view.cc
|
| @@ -220,7 +220,7 @@ class TaskManagerView : public views::ButtonListener,
|
| // all possible columns, not necessarily visible
|
| std::vector<ui::TableColumn> columns_;
|
|
|
| - scoped_ptr<TaskManagerTableModel> table_model_;
|
| + std::unique_ptr<TaskManagerTableModel> table_model_;
|
|
|
| // True when the Task Manager window should be shown on top of other windows.
|
| bool is_always_on_top_;
|
| @@ -232,7 +232,7 @@ class TaskManagerView : public views::ButtonListener,
|
| // is reset to NULL when the window is closed.
|
| static TaskManagerView* instance_;
|
|
|
| - scoped_ptr<views::MenuRunner> menu_runner_;
|
| + std::unique_ptr<views::MenuRunner> menu_runner_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(TaskManagerView);
|
| };
|
|
|