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

Side by Side Diff: ui/views/mus/mus_client.cc

Issue 2559703003: Converts WindowTreeClientTest to be in terms of aura (Closed)
Patch Set: feedback Created 4 years 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
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 "ui/views/mus/mus_client.h" 5 #include "ui/views/mus/mus_client.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/memory/ptr_util.h" 8 #include "base/memory/ptr_util.h"
9 #include "services/service_manager/public/cpp/connection.h" 9 #include "services/service_manager/public/cpp/connection.h"
10 #include "services/service_manager/public/cpp/connector.h" 10 #include "services/service_manager/public/cpp/connector.h"
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 base::Bind(&MusClient::CreateNativeWidget, base::Unretained(this))); 205 base::Bind(&MusClient::CreateNativeWidget, base::Unretained(this)));
206 } 206 }
207 207
208 void MusClient::OnEmbed( 208 void MusClient::OnEmbed(
209 std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) { 209 std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) {
210 NOTREACHED(); 210 NOTREACHED();
211 } 211 }
212 212
213 void MusClient::OnLostConnection(aura::WindowTreeClient* client) {} 213 void MusClient::OnLostConnection(aura::WindowTreeClient* client) {}
214 214
215 void MusClient::OnEmbedRootDestroyed(aura::Window* root) { 215 void MusClient::OnEmbedRootDestroyed(
216 // Not called for MusClient as WindowTreeClient isn't created by 216 aura::WindowTreeHostMus* window_tree_host) {
217 // way of an Embed(). 217 static_cast<DesktopWindowTreeHostMus*>(window_tree_host)
218 NOTREACHED(); 218 ->ServerDestroyedWindow();
219 } 219 }
220 220
221 void MusClient::OnPointerEventObserved(const ui::PointerEvent& event, 221 void MusClient::OnPointerEventObserved(const ui::PointerEvent& event,
222 aura::Window* target) { 222 aura::Window* target) {
223 pointer_watcher_event_router_->OnPointerEventObserved(event, target); 223 pointer_watcher_event_router_->OnPointerEventObserved(event, target);
224 } 224 }
225 225
226 void MusClient::OnWindowManagerFrameValuesChanged() { 226 void MusClient::OnWindowManagerFrameValuesChanged() {
227 for (auto& observer : observer_list_) 227 for (auto& observer : observer_list_)
228 observer.OnWindowManagerFrameValuesChanged(); 228 observer.OnWindowManagerFrameValuesChanged();
(...skipping 23 matching lines...) Expand all
252 return root->GetTopWindowContainingPoint(relative_point); 252 return root->GetTopWindowContainingPoint(relative_point);
253 } 253 }
254 return nullptr; 254 return nullptr;
255 } 255 }
256 256
257 std::unique_ptr<OSExchangeData::Provider> MusClient::BuildProvider() { 257 std::unique_ptr<OSExchangeData::Provider> MusClient::BuildProvider() {
258 return base::MakeUnique<aura::OSExchangeDataProviderMus>(); 258 return base::MakeUnique<aura::OSExchangeDataProviderMus>();
259 } 259 }
260 260
261 } // namespace views 261 } // namespace views
OLDNEW
« services/ui/ws/window_server_test_base.h ('K') | « ui/views/mus/mus_client.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698