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

Side by Side Diff: mash/wm/window_manager_application.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/window_manager.cc ('k') | mash/wm/window_manager_application.cc » ('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_WINDOW_MANAGER_APPLICATION_H_ 5 #ifndef MASH_WM_WINDOW_MANAGER_APPLICATION_H_
6 #define MASH_WM_WINDOW_MANAGER_APPLICATION_H_ 6 #define MASH_WM_WINDOW_MANAGER_APPLICATION_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory>
10 #include <set> 11 #include <set>
11 12
12 #include "base/macros.h" 13 #include "base/macros.h"
13 #include "base/memory/scoped_ptr.h"
14 #include "base/observer_list.h" 14 #include "base/observer_list.h"
15 #include "components/mus/common/types.h" 15 #include "components/mus/common/types.h"
16 #include "components/mus/public/interfaces/accelerator_registrar.mojom.h" 16 #include "components/mus/public/interfaces/accelerator_registrar.mojom.h"
17 #include "components/mus/public/interfaces/window_manager.mojom.h" 17 #include "components/mus/public/interfaces/window_manager.mojom.h"
18 #include "components/mus/public/interfaces/window_manager_factory.mojom.h" 18 #include "components/mus/public/interfaces/window_manager_factory.mojom.h"
19 #include "components/mus/public/interfaces/window_tree_host.mojom.h" 19 #include "components/mus/public/interfaces/window_tree_host.mojom.h"
20 #include "mash/session/public/interfaces/session.mojom.h" 20 #include "mash/session/public/interfaces/session.mojom.h"
21 #include "mash/wm/public/interfaces/user_window_controller.mojom.h" 21 #include "mash/wm/public/interfaces/user_window_controller.mojom.h"
22 #include "mojo/public/cpp/bindings/binding.h" 22 #include "mojo/public/cpp/bindings/binding.h"
23 #include "mojo/public/cpp/bindings/binding_set.h" 23 #include "mojo/public/cpp/bindings/binding_set.h"
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 103
104 // mus::mojom::WindowManagerFactory: 104 // mus::mojom::WindowManagerFactory:
105 void CreateWindowManager(mus::mojom::DisplayPtr display, 105 void CreateWindowManager(mus::mojom::DisplayPtr display,
106 mojo::InterfaceRequest<mus::mojom::WindowTreeClient> 106 mojo::InterfaceRequest<mus::mojom::WindowTreeClient>
107 client_request) override; 107 client_request) override;
108 108
109 mojo::Connector* connector_; 109 mojo::Connector* connector_;
110 110
111 mojo::TracingImpl tracing_; 111 mojo::TracingImpl tracing_;
112 112
113 scoped_ptr<ui::mojo::UIInit> ui_init_; 113 std::unique_ptr<ui::mojo::UIInit> ui_init_;
114 scoped_ptr<views::AuraInit> aura_init_; 114 std::unique_ptr<views::AuraInit> aura_init_;
115 115
116 // |user_window_controller_| is created once OnEmbed() is called. Until that 116 // |user_window_controller_| is created once OnEmbed() is called. Until that
117 // time |user_window_controller_requests_| stores pending interface requests. 117 // time |user_window_controller_requests_| stores pending interface requests.
118 scoped_ptr<UserWindowControllerImpl> user_window_controller_; 118 std::unique_ptr<UserWindowControllerImpl> user_window_controller_;
119 mojo::BindingSet<mash::wm::mojom::UserWindowController> 119 mojo::BindingSet<mash::wm::mojom::UserWindowController>
120 user_window_controller_binding_; 120 user_window_controller_binding_;
121 std::vector< 121 std::vector<std::unique_ptr<
122 scoped_ptr<mojo::InterfaceRequest<mash::wm::mojom::UserWindowController>>> 122 mojo::InterfaceRequest<mash::wm::mojom::UserWindowController>>>
123 user_window_controller_requests_; 123 user_window_controller_requests_;
124 124
125 std::set<AcceleratorRegistrarImpl*> accelerator_registrars_; 125 std::set<AcceleratorRegistrarImpl*> accelerator_registrars_;
126 std::set<RootWindowController*> root_controllers_; 126 std::set<RootWindowController*> root_controllers_;
127 127
128 mojo::Binding<mus::mojom::WindowManagerFactory> 128 mojo::Binding<mus::mojom::WindowManagerFactory>
129 window_manager_factory_binding_; 129 window_manager_factory_binding_;
130 130
131 mash::session::mojom::SessionPtr session_; 131 mash::session::mojom::SessionPtr session_;
132 132
133 base::ObserverList<RootWindowsObserver> root_windows_observers_; 133 base::ObserverList<RootWindowsObserver> root_windows_observers_;
134 134
135 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication); 135 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication);
136 }; 136 };
137 137
138 } // namespace wm 138 } // namespace wm
139 } // namespace mash 139 } // namespace mash
140 140
141 #endif // MASH_WM_WINDOW_MANAGER_APPLICATION_H_ 141 #endif // MASH_WM_WINDOW_MANAGER_APPLICATION_H_
OLDNEW
« no previous file with comments | « mash/wm/window_manager.cc ('k') | mash/wm/window_manager_application.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698