Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 SERVICES_UI_PUBLIC_CPP_WINDOW_TREE_HOST_FACTORY_H_ | 5 #ifndef SERVICES_UI_PUBLIC_CPP_WINDOW_TREE_HOST_FACTORY_H_ |
| 6 #define SERVICES_UI_PUBLIC_CPP_WINDOW_TREE_HOST_FACTORY_H_ | 6 #define SERVICES_UI_PUBLIC_CPP_WINDOW_TREE_HOST_FACTORY_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "base/compiler_specific.h" | |
| 10 #include "mojo/public/cpp/bindings/binding.h" | 11 #include "mojo/public/cpp/bindings/binding.h" |
| 11 #include "services/ui/public/interfaces/window_tree.mojom.h" | 12 #include "services/ui/public/interfaces/window_tree.mojom.h" |
| 12 #include "services/ui/public/interfaces/window_tree_host.mojom.h" | 13 #include "services/ui/public/interfaces/window_tree_host.mojom.h" |
| 13 | 14 |
| 14 namespace shell { | 15 namespace shell { |
| 15 class Connector; | 16 class Connector; |
| 16 } | 17 } |
| 17 | 18 |
| 18 namespace ui { | 19 namespace ui { |
| 19 | 20 |
| 20 class WindowManagerDelegate; | 21 class WindowManagerDelegate; |
| 22 class WindowTreeClient; | |
| 21 class WindowTreeClientDelegate; | 23 class WindowTreeClientDelegate; |
| 22 | 24 |
| 23 // The following create a new window tree host. Supply a |factory| if you have | 25 // The following create a new window tree host. Supply a |factory| if you have |
| 24 // already connected to mus, otherwise supply |shell|, which contacts mus and | 26 // already connected to mus, otherwise supply |shell|, which contacts mus and |
| 25 // obtains a WindowTreeHostFactory. | 27 // obtains a WindowTreeHostFactory. |
| 26 void CreateWindowTreeHost(mojom::WindowTreeHostFactory* factory, | 28 WARN_UNUSED_RESULT std::unique_ptr<WindowTreeClient> CreateWindowTreeHost( |
|
sadrul
2016/09/02 17:04:15
WARN_UNUSED_RESULT seem to be normally used at the
sky
2016/09/06 17:15:42
I'm going to remove it. I mostly did it to ensure
| |
| 27 WindowTreeClientDelegate* delegate, | 29 mojom::WindowTreeHostFactory* factory, |
| 28 mojom::WindowTreeHostPtr* host, | 30 WindowTreeClientDelegate* delegate, |
| 29 WindowManagerDelegate* window_manager_delegate); | 31 mojom::WindowTreeHostPtr* host, |
| 30 void CreateWindowTreeHost(shell::Connector* connector, | 32 WindowManagerDelegate* window_manager_delegate); |
| 31 WindowTreeClientDelegate* delegate, | 33 WARN_UNUSED_RESULT std::unique_ptr<WindowTreeClient> CreateWindowTreeHost( |
| 32 mojom::WindowTreeHostPtr* host, | 34 shell::Connector* connector, |
| 33 WindowManagerDelegate* window_manager_delegate); | 35 WindowTreeClientDelegate* delegate, |
| 36 mojom::WindowTreeHostPtr* host, | |
| 37 WindowManagerDelegate* window_manager_delegate); | |
| 34 | 38 |
| 35 } // namespace ui | 39 } // namespace ui |
| 36 | 40 |
| 37 #endif // SERVICES_UI_PUBLIC_CPP_WINDOW_TREE_HOST_FACTORY_H_ | 41 #endif // SERVICES_UI_PUBLIC_CPP_WINDOW_TREE_HOST_FACTORY_H_ |
| OLD | NEW |