Index: services/ui/demo/mus_demo.h |
diff --git a/services/ui/demo/mus_demo.h b/services/ui/demo/mus_demo.h |
index a881deccbaa504239f285b0b7989d7ed459ef263..b8d5cb504c7d37291a320f879bcc7769a516f29f 100644 |
--- a/services/ui/demo/mus_demo.h |
+++ b/services/ui/demo/mus_demo.h |
@@ -44,13 +44,14 @@ namespace demo { |
// the window. Provides a simple way to demonstrate that the graphic stack works |
// as intended. |
class MusDemo : public service_manager::Service, |
- public aura::WindowTreeClientDelegate, |
- public aura::WindowManagerDelegate { |
+ public aura::WindowTreeClientDelegate { |
tonikitoo
2017/02/14 20:00:43
so, the resulting MusDemo class still inherits fro
fwang
2017/02/14 20:47:28
I think OnLostConnection is implemented in MusDemo
|
public: |
MusDemo(); |
~MusDemo() override; |
protected: |
+ virtual void OnStartImpl() = 0; |
+ |
class WindowTreeData { |
public: |
explicit WindowTreeData( |
@@ -87,6 +88,9 @@ class MusDemo : public service_manager::Service, |
}; |
std::unique_ptr<WindowTreeData> window_tree_data_; |
+ std::unique_ptr<display::ScreenBase> screen_; |
kylechar
2017/02/14 18:40:11
These must be in the private section.
|
+ std::unique_ptr<aura::WindowTreeClient> window_tree_client_; |
+ |
private: |
// service_manager::Service: |
void OnStart() override; |
@@ -103,41 +107,7 @@ class MusDemo : public service_manager::Service, |
aura::Window* target) override; |
aura::PropertyConverter* GetPropertyConverter() override; |
- // aura::WindowManagerDelegate: |
kylechar
2017/02/14 18:40:11
Remove the includes that were added just for Windo
|
- void SetWindowManagerClient(aura::WindowManagerClient* client) override; |
- bool OnWmSetBounds(aura::Window* window, gfx::Rect* bounds) override; |
- bool OnWmSetProperty( |
- aura::Window* window, |
- const std::string& name, |
- std::unique_ptr<std::vector<uint8_t>>* new_data) override; |
- void OnWmSetCanFocus(aura::Window* window, bool can_focus) override; |
- aura::Window* OnWmCreateTopLevelWindow( |
- ui::mojom::WindowType window_type, |
- std::map<std::string, std::vector<uint8_t>>* properties) override; |
- void OnWmClientJankinessChanged(const std::set<aura::Window*>& client_windows, |
- bool janky) override; |
- void OnWmWillCreateDisplay(const display::Display& display) override; |
- void OnWmNewDisplay(std::unique_ptr<aura::WindowTreeHostMus> window_tree_host, |
- const display::Display& display) override; |
- void OnWmDisplayRemoved(aura::WindowTreeHostMus* window_tree_host) override; |
- void OnWmDisplayModified(const display::Display& display) override; |
- ui::mojom::EventResult OnAccelerator(uint32_t id, |
- const ui::Event& event) override; |
- void OnWmPerformMoveLoop(aura::Window* window, |
- ui::mojom::MoveLoopSource source, |
- const gfx::Point& cursor_location, |
- const base::Callback<void(bool)>& on_done) override; |
- void OnWmCancelMoveLoop(aura::Window* window) override; |
- void OnWmSetClientArea( |
- aura::Window* window, |
- const gfx::Insets& insets, |
- const std::vector<gfx::Rect>& additional_client_areas) override; |
- bool IsWindowActive(aura::Window* window) override; |
- void OnWmDeactivateWindow(aura::Window* window) override; |
- |
- std::unique_ptr<aura::WindowTreeClient> window_tree_client_; |
std::unique_ptr<aura::Env> env_; |
- std::unique_ptr<display::ScreenBase> screen_; |
std::unique_ptr<aura::client::DefaultCaptureClient> capture_client_; |
std::unique_ptr<::wm::WMState> wm_state_; |