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

Unified Diff: ui/views/mus/mus_client.cc

Issue 2759463002: aura-mus: create an interactive ui test for drag and drop. (Closed)
Patch Set: Merge with master Created 3 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/mus/mus_client.h ('k') | ui/views/mus/test_utils.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/mus/mus_client.cc
diff --git a/ui/views/mus/mus_client.cc b/ui/views/mus/mus_client.cc
index 41401adeaa345bb978a2d5b5b3425621e3c470c2..6a0a0d1ec598d924c89a4e807bba7b64069a56f5 100644
--- a/ui/views/mus/mus_client.cc
+++ b/ui/views/mus/mus_client.cc
@@ -61,7 +61,8 @@ MusClient* MusClient::instance_ = nullptr;
MusClient::MusClient(service_manager::Connector* connector,
const service_manager::Identity& identity,
scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
- bool create_wm_state)
+ bool create_wm_state,
+ MusClientTestingState testing_state)
: identity_(identity) {
DCHECK(!instance_);
DCHECK(aura::Env::GetInstance());
@@ -85,6 +86,11 @@ MusClient::MusClient(service_manager::Connector* connector,
if (create_wm_state)
wm_state_ = base::MakeUnique<wm::WMState>();
+ if (testing_state == MusClientTestingState::CREATE_TESTING_STATE) {
+ connector->BindInterface(ui::mojom::kServiceName, &server_test_ptr_);
+ server_test_ptr_.EnableNestedDispatch(true);
+ }
+
window_tree_client_ = base::MakeUnique<aura::WindowTreeClient>(
connector, this, nullptr /* window_manager_delegate */,
nullptr /* window_tree_client_request */, std::move(io_task_runner));
@@ -243,6 +249,13 @@ void MusClient::SetMusPropertyMirror(
mus_property_mirror_ = std::move(mirror);
}
+ui::mojom::WindowServerTest* MusClient::GetTestingInterface() const {
+ // This will only be set in tests. CHECK to ensure it doesn't get used
+ // elsewhere.
+ CHECK(server_test_ptr_);
+ return server_test_ptr_.get();
+}
+
std::unique_ptr<DesktopWindowTreeHost> MusClient::CreateDesktopWindowTreeHost(
const Widget::InitParams& init_params,
internal::NativeWidgetDelegate* delegate,
« no previous file with comments | « ui/views/mus/mus_client.h ('k') | ui/views/mus/test_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698