OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 #include "services/ui/demo/mus_demo.h" | 5 #include "services/ui/demo/mus_demo.h" |
6 | 6 |
7 #include "base/memory/ptr_util.h" | 7 #include "base/memory/ptr_util.h" |
8 #include "services/service_manager/public/cpp/connector.h" | 8 #include "services/service_manager/public/cpp/connector.h" |
9 #include "services/ui/demo/window_tree_data.h" | 9 #include "services/ui/demo/window_tree_data.h" |
10 #include "services/ui/public/cpp/gpu/gpu.h" | 10 #include "services/ui/public/cpp/gpu/gpu.h" |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
44 | 44 |
45 void MusDemo::OnStart() { | 45 void MusDemo::OnStart() { |
46 screen_ = base::MakeUnique<display::ScreenBase>(); | 46 screen_ = base::MakeUnique<display::ScreenBase>(); |
47 display::Screen::SetScreenInstance(screen_.get()); | 47 display::Screen::SetScreenInstance(screen_.get()); |
48 | 48 |
49 env_ = aura::Env::CreateInstance(aura::Env::Mode::MUS); | 49 env_ = aura::Env::CreateInstance(aura::Env::Mode::MUS); |
50 capture_client_ = base::MakeUnique<aura::client::DefaultCaptureClient>(); | 50 capture_client_ = base::MakeUnique<aura::client::DefaultCaptureClient>(); |
51 property_converter_ = base::MakeUnique<aura::PropertyConverter>(); | 51 property_converter_ = base::MakeUnique<aura::PropertyConverter>(); |
52 wm_state_ = base::MakeUnique<::wm::WMState>(); | 52 wm_state_ = base::MakeUnique<::wm::WMState>(); |
53 | 53 |
54 OnStartImpl(window_tree_client_, window_tree_data_); | 54 OnStartImpl(&window_tree_client_, &window_tree_data_); |
55 | 55 |
56 env_->SetWindowTreeClient(window_tree_client_.get()); | 56 env_->SetWindowTreeClient(window_tree_client_.get()); |
57 } | 57 } |
58 | 58 |
59 bool MusDemo::OnConnect(const service_manager::ServiceInfo& remote_info, | 59 bool MusDemo::OnConnect(const service_manager::ServiceInfo& remote_info, |
60 service_manager::InterfaceRegistry* registry) { | 60 service_manager::InterfaceRegistry* registry) { |
61 return true; | 61 return true; |
62 } | 62 } |
63 | 63 |
64 void MusDemo::OnEmbed( | 64 void MusDemo::OnEmbed( |
(...skipping 16 matching lines...) Expand all Loading... |
81 | 81 |
82 void MusDemo::OnPointerEventObserved(const PointerEvent& event, | 82 void MusDemo::OnPointerEventObserved(const PointerEvent& event, |
83 aura::Window* target) {} | 83 aura::Window* target) {} |
84 | 84 |
85 aura::PropertyConverter* MusDemo::GetPropertyConverter() { | 85 aura::PropertyConverter* MusDemo::GetPropertyConverter() { |
86 return property_converter_.get(); | 86 return property_converter_.get(); |
87 } | 87 } |
88 | 88 |
89 } // namespace demo | 89 } // namespace demo |
90 } // namespace ui | 90 } // namespace ui |
OLD | NEW |