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

Unified Diff: ash/shell/window_watcher.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: 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
Index: ash/shell/window_watcher.h
diff --git a/ash/shell/window_watcher.h b/ash/shell/window_watcher.h
index cb28f94e4a197e44c04b01ee30c86888651caf0c..19a1d3434d598d61c3733c0a9a6f4375b4c8544d 100644
--- a/ash/shell/window_watcher.h
+++ b/ash/shell/window_watcher.h
@@ -8,12 +8,12 @@
#include <stdint.h>
#include <map>
+#include <memory>
#include "ash/shelf/shelf_item_types.h"
#include "base/compiler_specific.h"
#include "base/logging.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "ui/aura/window_observer.h"
#include "ui/gfx/display_observer.h"
@@ -54,7 +54,7 @@ class WindowWatcher : public aura::WindowObserver,
// Maps from window to the id we gave it.
IDToWindow id_to_window_;
- scoped_ptr<WorkspaceWindowWatcher> workspace_window_watcher_;
+ std::unique_ptr<WorkspaceWindowWatcher> workspace_window_watcher_;
DISALLOW_COPY_AND_ASSIGN(WindowWatcher);
};

Powered by Google App Engine
This is Rietveld 408576698