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

Side by Side Diff: components/mus/public/cpp/tests/window_server_test_base.cc

Issue 1949823002: WIP: Eliminate event.target() usage from TrayEventFilter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: container delegate Created 4 years, 7 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
OLDNEW
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 #include "components/mus/public/cpp/tests/window_server_test_base.h" 5 #include "components/mus/public/cpp/tests/window_server_test_base.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "base/run_loop.h" 9 #include "base/run_loop.h"
10 #include "base/test/test_timeouts.h" 10 #include "base/test/test_timeouts.h"
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 most_recent_connection_ = root->connection(); 80 most_recent_connection_ = root->connection();
81 EXPECT_TRUE(QuitRunLoop()); 81 EXPECT_TRUE(QuitRunLoop());
82 ASSERT_TRUE(window_manager_client_); 82 ASSERT_TRUE(window_manager_client_);
83 window_manager_client_->AddActivationParent(root); 83 window_manager_client_->AddActivationParent(root);
84 } 84 }
85 85
86 void WindowServerTestBase::OnConnectionLost(WindowTreeConnection* connection) { 86 void WindowServerTestBase::OnConnectionLost(WindowTreeConnection* connection) {
87 window_tree_connection_destroyed_ = true; 87 window_tree_connection_destroyed_ = true;
88 } 88 }
89 89
90 void WindowServerTestBase::OnEventObserved(const ui::Event& event) {} 90 void WindowServerTestBase::OnEventObserved(const ui::Event& event, Window* targe t) {}
91 91
92 void WindowServerTestBase::SetWindowManagerClient(WindowManagerClient* client) { 92 void WindowServerTestBase::SetWindowManagerClient(WindowManagerClient* client) {
93 window_manager_client_ = client; 93 window_manager_client_ = client;
94 } 94 }
95 95
96 bool WindowServerTestBase::OnWmSetBounds(Window* window, gfx::Rect* bounds) { 96 bool WindowServerTestBase::OnWmSetBounds(Window* window, gfx::Rect* bounds) {
97 return window_manager_delegate_ 97 return window_manager_delegate_
98 ? window_manager_delegate_->OnWmSetBounds(window, bounds) 98 ? window_manager_delegate_->OnWmSetBounds(window, bounds)
99 : true; 99 : true;
100 } 100 }
(...skipping 21 matching lines...) Expand all
122 122
123 void WindowServerTestBase::Create( 123 void WindowServerTestBase::Create(
124 shell::Connection* connection, 124 shell::Connection* connection,
125 mojo::InterfaceRequest<mojom::WindowTreeClient> request) { 125 mojo::InterfaceRequest<mojom::WindowTreeClient> request) {
126 WindowTreeConnection::Create( 126 WindowTreeConnection::Create(
127 this, std::move(request), 127 this, std::move(request),
128 WindowTreeConnection::CreateType::DONT_WAIT_FOR_EMBED); 128 WindowTreeConnection::CreateType::DONT_WAIT_FOR_EMBED);
129 } 129 }
130 130
131 } // namespace mus 131 } // namespace mus
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698