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

Side by Side Diff: ui/wm/core/wm_state.h

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr 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 unified diff | Download patch
« no previous file with comments | « ui/wm/core/window_util_unittest.cc ('k') | ui/wm/public/scoped_drag_drop_disabler.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_WM_CORE_WM_STATE_H_ 5 #ifndef UI_WM_CORE_WM_STATE_H_
6 #define UI_WM_CORE_WM_STATE_H_ 6 #define UI_WM_CORE_WM_STATE_H_
7 7
8 #include <memory>
9
8 #include "base/macros.h" 10 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h"
10 #include "ui/wm/wm_export.h" 11 #include "ui/wm/wm_export.h"
11 12
12 namespace wm { 13 namespace wm {
13 14
14 class TransientWindowController; 15 class TransientWindowController;
15 class TransientWindowStackingClient; 16 class TransientWindowStackingClient;
16 17
17 // Installs state needed by the window manager. 18 // Installs state needed by the window manager.
18 class WM_EXPORT WMState { 19 class WM_EXPORT WMState {
19 public: 20 public:
20 WMState(); 21 WMState();
21 ~WMState(); 22 ~WMState();
22 23
23 // WindowStackingClient: 24 // WindowStackingClient:
24 private: 25 private:
25 scoped_ptr<TransientWindowStackingClient> window_stacking_client_; 26 std::unique_ptr<TransientWindowStackingClient> window_stacking_client_;
26 scoped_ptr<TransientWindowController> transient_window_client_; 27 std::unique_ptr<TransientWindowController> transient_window_client_;
27 28
28 DISALLOW_COPY_AND_ASSIGN(WMState); 29 DISALLOW_COPY_AND_ASSIGN(WMState);
29 }; 30 };
30 31
31 } // namespace wm 32 } // namespace wm
32 33
33 #endif // UI_WM_CORE_WM_STATE_H_ 34 #endif // UI_WM_CORE_WM_STATE_H_
OLDNEW
« no previous file with comments | « ui/wm/core/window_util_unittest.cc ('k') | ui/wm/public/scoped_drag_drop_disabler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698