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

Side by Side Diff: services/ui/demo/mus_demo.cc

Issue 2795883002: Eliminate OnConnect usage (Closed)
Patch Set: . Created 3 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 | « services/ui/demo/mus_demo.h ('k') | services/ui/display/screen_manager.h » ('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 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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 capture_client_ = base::MakeUnique<aura::client::DefaultCaptureClient>(); 75 capture_client_ = base::MakeUnique<aura::client::DefaultCaptureClient>();
76 property_converter_ = base::MakeUnique<aura::PropertyConverter>(); 76 property_converter_ = base::MakeUnique<aura::PropertyConverter>();
77 wm_state_ = base::MakeUnique<::wm::WMState>(); 77 wm_state_ = base::MakeUnique<::wm::WMState>();
78 78
79 window_tree_client_ = CreateWindowTreeClient(); 79 window_tree_client_ = CreateWindowTreeClient();
80 OnStartImpl(); 80 OnStartImpl();
81 81
82 env_->SetWindowTreeClient(window_tree_client_.get()); 82 env_->SetWindowTreeClient(window_tree_client_.get());
83 } 83 }
84 84
85 bool MusDemo::OnConnect(const service_manager::ServiceInfo& remote_info,
86 service_manager::InterfaceRegistry* registry) {
87 return true;
88 }
89
90 void MusDemo::OnEmbed( 85 void MusDemo::OnEmbed(
91 std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) { 86 std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) {
92 NOTREACHED(); 87 NOTREACHED();
93 } 88 }
94 89
95 void MusDemo::OnUnembed(aura::Window* root) { 90 void MusDemo::OnUnembed(aura::Window* root) {
96 NOTREACHED(); 91 NOTREACHED();
97 } 92 }
98 93
99 void MusDemo::OnEmbedRootDestroyed(aura::WindowTreeHostMus* window_tree_host) { 94 void MusDemo::OnEmbedRootDestroyed(aura::WindowTreeHostMus* window_tree_host) {
100 NOTREACHED(); 95 NOTREACHED();
101 } 96 }
102 97
103 void MusDemo::OnLostConnection(aura::WindowTreeClient* client) { 98 void MusDemo::OnLostConnection(aura::WindowTreeClient* client) {
104 window_tree_client_.reset(); 99 window_tree_client_.reset();
105 window_tree_data_list_.clear(); 100 window_tree_data_list_.clear();
106 } 101 }
107 102
108 void MusDemo::OnPointerEventObserved(const PointerEvent& event, 103 void MusDemo::OnPointerEventObserved(const PointerEvent& event,
109 aura::Window* target) {} 104 aura::Window* target) {}
110 105
111 aura::PropertyConverter* MusDemo::GetPropertyConverter() { 106 aura::PropertyConverter* MusDemo::GetPropertyConverter() {
112 return property_converter_.get(); 107 return property_converter_.get();
113 } 108 }
114 109
115 } // namespace demo 110 } // namespace demo
116 } // namespace ui 111 } // namespace ui
OLDNEW
« no previous file with comments | « services/ui/demo/mus_demo.h ('k') | services/ui/display/screen_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698