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

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

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/interactive_ui_tests_manifest.json ('k') | ui/views/mus/mus_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/mus/mus_client.h
diff --git a/ui/views/mus/mus_client.h b/ui/views/mus/mus_client.h
index 42e1ac5596b8fe09ddc9de79319ffc65e471895e..3469b3e06b2e64f5f728cc445fb0dd889e3a9332 100644
--- a/ui/views/mus/mus_client.h
+++ b/ui/views/mus/mus_client.h
@@ -13,6 +13,7 @@
#include "base/macros.h"
#include "services/service_manager/public/cpp/identity.h"
+#include "services/ui/public/interfaces/window_server_test.mojom.h"
#include "ui/aura/client/capture_client.h"
#include "ui/aura/mus/window_tree_client_delegate.h"
#include "ui/views/mus/mus_export.h"
@@ -54,6 +55,8 @@ namespace test {
class MusClientTestApi;
}
+enum MusClientTestingState { NO_TESTING, CREATE_TESTING_STATE };
+
// MusClient establishes a connection to mus and sets up necessary state so that
// aura and views target mus. This class is useful for typical clients, not the
// WindowManager. Most clients don't create this directly, rather use AuraInit.
@@ -66,7 +69,8 @@ class VIEWS_MUS_EXPORT MusClient : public aura::WindowTreeClientDelegate,
service_manager::Connector* connector,
const service_manager::Identity& identity,
scoped_refptr<base::SingleThreadTaskRunner> io_task_runner = nullptr,
- bool create_wm_state = true);
+ bool create_wm_state = true,
+ MusClientTestingState testing_state = MusClientTestingState::NO_TESTING);
~MusClient() override;
static MusClient* Get() { return instance_; }
@@ -111,6 +115,10 @@ class VIEWS_MUS_EXPORT MusClient : public aura::WindowTreeClientDelegate,
return mus_property_mirror_.get();
}
+ // Returns an interface to directly control mus. Only available when created
+ // with MusClientTestingState::CREATE_TESTING_STATE.
+ ui::mojom::WindowServerTest* GetTestingInterface() const;
+
private:
friend class AuraInit;
friend class test::MusClientTestApi;
@@ -157,6 +165,8 @@ class VIEWS_MUS_EXPORT MusClient : public aura::WindowTreeClientDelegate,
std::unique_ptr<PointerWatcherEventRouter> pointer_watcher_event_router_;
+ ui::mojom::WindowServerTestPtr server_test_ptr_;
+
DISALLOW_COPY_AND_ASSIGN(MusClient);
};
« no previous file with comments | « ui/views/mus/interactive_ui_tests_manifest.json ('k') | ui/views/mus/mus_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698