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

Unified Diff: mash/wm/root_window_controller.h

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/wm/non_client_frame_controller.cc ('k') | mash/wm/shadow.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/wm/root_window_controller.h
diff --git a/mash/wm/root_window_controller.h b/mash/wm/root_window_controller.h
index c64eb31cc93bbc3902cbf2fa7e64159a2fc348d9..655a2b584ea996a4bfa1e818b5c563099dbb4e93 100644
--- a/mash/wm/root_window_controller.h
+++ b/mash/wm/root_window_controller.h
@@ -5,6 +5,8 @@
#ifndef MASH_WM_ROOT_WINDOW_CONTROLLER_H_
#define MASH_WM_ROOT_WINDOW_CONTROLLER_H_
+#include <memory>
+
#include "components/mus/public/cpp/window_observer.h"
#include "components/mus/public/cpp/window_tree_delegate.h"
#include "components/mus/public/interfaces/window_manager_constants.mojom.h"
@@ -86,11 +88,11 @@ class RootWindowController : public mus::WindowObserver,
mus::Window* root_;
int window_count_;
- scoped_ptr<WindowManager> window_manager_;
+ std::unique_ptr<WindowManager> window_manager_;
- std::map<mus::Window*, scoped_ptr<LayoutManager>> layout_manager_;
+ std::map<mus::Window*, std::unique_ptr<LayoutManager>> layout_manager_;
- scoped_ptr<ShadowController> shadow_controller_;
+ std::unique_ptr<ShadowController> shadow_controller_;
mus::mojom::DisplayPtr display_;
« no previous file with comments | « mash/wm/non_client_frame_controller.cc ('k') | mash/wm/shadow.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698