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

Side by Side Diff: ash/mus/window_manager_application.h

Issue 2301353003: Changes ownership of WindowTreeClient (Closed)
Patch Set: fix navigation Created 4 years, 3 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 | « ash/mus/window_manager.cc ('k') | ash/mus/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 ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ 5 #ifndef ASH_MUS_WINDOW_MANAGER_APPLICATION_H_
6 #define ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ 6 #define ASH_MUS_WINDOW_MANAGER_APPLICATION_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 WindowManager* window_manager() { return window_manager_.get(); } 58 WindowManager* window_manager() { return window_manager_.get(); }
59 59
60 mash::session::mojom::Session* session() { return session_.get(); } 60 mash::session::mojom::Session* session() { return session_.get(); }
61 61
62 private: 62 private:
63 friend class WmTestBase; 63 friend class WmTestBase;
64 friend class WmTestHelper; 64 friend class WmTestHelper;
65 65
66 void OnAcceleratorRegistrarDestroyed(AcceleratorRegistrarImpl* registrar); 66 void OnAcceleratorRegistrarDestroyed(AcceleratorRegistrarImpl* registrar);
67 67
68 void InitWindowManager(ui::WindowTreeClient* window_tree_client); 68 void InitWindowManager(
69 std::unique_ptr<ui::WindowTreeClient> window_tree_client);
69 70
70 // shell::Service: 71 // shell::Service:
71 void OnStart(const shell::Identity& identity) override; 72 void OnStart(const shell::Identity& identity) override;
72 bool OnConnect(const shell::Identity& remote_identity, 73 bool OnConnect(const shell::Identity& remote_identity,
73 shell::InterfaceRegistry* registry) override; 74 shell::InterfaceRegistry* registry) override;
74 75
75 // InterfaceFactory<ash::mojom::ShelfController>: 76 // InterfaceFactory<ash::mojom::ShelfController>:
76 void Create(const shell::Identity& remote_identity, 77 void Create(const shell::Identity& remote_identity,
77 ash::mojom::ShelfControllerRequest request) override; 78 ash::mojom::ShelfControllerRequest request) override;
78 79
(...skipping 27 matching lines...) Expand all
106 statistics_provider_; 107 statistics_provider_;
107 #endif 108 #endif
108 109
109 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication); 110 DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication);
110 }; 111 };
111 112
112 } // namespace mus 113 } // namespace mus
113 } // namespace ash 114 } // namespace ash
114 115
115 #endif // ASH_MUS_WINDOW_MANAGER_APPLICATION_H_ 116 #endif // ASH_MUS_WINDOW_MANAGER_APPLICATION_H_
OLDNEW
« no previous file with comments | « ash/mus/window_manager.cc ('k') | ash/mus/window_manager_application.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698