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

Unified Diff: ash/test/test_shell_delegate.h

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments 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 | « ash/test/test_shelf_delegate.cc ('k') | ash/test/test_suite.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/test_shell_delegate.h
diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h
index c27879dd3be8ca2af081a8dc37fe8bbac0e8a84b..63727c034cebafa5cd5bddb5cf98925045b3cfd9 100644
--- a/ash/test/test_shell_delegate.h
+++ b/ash/test/test_shell_delegate.h
@@ -5,6 +5,7 @@
#ifndef ASH_TEST_TEST_SHELL_DELEGATE_H_
#define ASH_TEST_TEST_SHELL_DELEGATE_H_
+#include <memory>
#include <string>
#include "ash/media_delegate.h"
@@ -12,7 +13,6 @@
#include "ash/test/test_session_state_delegate.h"
#include "base/compiler_specific.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/observer_list.h"
namespace keyboard {
@@ -74,7 +74,7 @@ class TestShellDelegate : public ShellDelegate {
bool multi_profiles_enabled_;
bool force_maximize_on_first_run_;
- scoped_ptr<app_list::AppListViewDelegate> app_list_view_delegate_;
+ std::unique_ptr<app_list::AppListViewDelegate> app_list_view_delegate_;
base::ObserverList<ash::VirtualKeyboardStateObserver>
keyboard_state_observer_list_;
« no previous file with comments | « ash/test/test_shelf_delegate.cc ('k') | ash/test/test_suite.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698