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

Side by Side Diff: mash/wm/user_window_controller_impl.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, 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 | « mash/wm/shadow.h ('k') | mash/wm/window_manager.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 MASH_WM_USER_WINDOW_CONTROLLER_IMPL_H_ 5 #ifndef MASH_WM_USER_WINDOW_CONTROLLER_IMPL_H_
6 #define MASH_WM_USER_WINDOW_CONTROLLER_IMPL_H_ 6 #define MASH_WM_USER_WINDOW_CONTROLLER_IMPL_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory>
11
10 #include "base/macros.h" 12 #include "base/macros.h"
11 #include "components/mus/common/types.h" 13 #include "components/mus/common/types.h"
12 #include "components/mus/public/cpp/window_observer.h" 14 #include "components/mus/public/cpp/window_observer.h"
13 #include "components/mus/public/cpp/window_tree_connection_observer.h" 15 #include "components/mus/public/cpp/window_tree_connection_observer.h"
14 #include "mash/wm/public/interfaces/user_window_controller.mojom.h" 16 #include "mash/wm/public/interfaces/user_window_controller.mojom.h"
15 17
16 namespace mash { 18 namespace mash {
17 namespace wm { 19 namespace wm {
18 20
19 class RootWindowController; 21 class RootWindowController;
(...skipping 22 matching lines...) Expand all
42 // mus::WindowTreeConnectionObserver: 44 // mus::WindowTreeConnectionObserver:
43 void OnWindowTreeFocusChanged(mus::Window* gained_focus, 45 void OnWindowTreeFocusChanged(mus::Window* gained_focus,
44 mus::Window* lost_focus) override; 46 mus::Window* lost_focus) override;
45 47
46 // mojom::UserWindowController: 48 // mojom::UserWindowController:
47 void AddUserWindowObserver(mojom::UserWindowObserverPtr observer) override; 49 void AddUserWindowObserver(mojom::UserWindowObserverPtr observer) override;
48 void FocusUserWindow(uint32_t window_id) override; 50 void FocusUserWindow(uint32_t window_id) override;
49 51
50 RootWindowController* root_controller_; 52 RootWindowController* root_controller_;
51 mojom::UserWindowObserverPtr user_window_observer_; 53 mojom::UserWindowObserverPtr user_window_observer_;
52 scoped_ptr<WindowPropertyObserver> window_property_observer_; 54 std::unique_ptr<WindowPropertyObserver> window_property_observer_;
53 55
54 DISALLOW_COPY_AND_ASSIGN(UserWindowControllerImpl); 56 DISALLOW_COPY_AND_ASSIGN(UserWindowControllerImpl);
55 }; 57 };
56 58
57 } // namespace wm 59 } // namespace wm
58 } // namespace mash 60 } // namespace mash
59 61
60 #endif // MASH_WM_USER_WINDOW_CONTROLLER_IMPL_H_ 62 #endif // MASH_WM_USER_WINDOW_CONTROLLER_IMPL_H_
OLDNEW
« no previous file with comments | « mash/wm/shadow.h ('k') | mash/wm/window_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698