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

Unified Diff: services/ui/ws/test_utils.cc

Issue 2916823002: Move Mus into chrome's process when running with --mus.
Patch Set: Undo Screen TLS change, don't use Screen::GetScreen() in Mus. Created 3 years, 6 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
Index: services/ui/ws/test_utils.cc
diff --git a/services/ui/ws/test_utils.cc b/services/ui/ws/test_utils.cc
index 0a9649788e34616f782f2c1a2228aea7c2aa821f..54b775ce5a8d327628a0999a0321287781619bcf 100644
--- a/services/ui/ws/test_utils.cc
+++ b/services/ui/ws/test_utils.cc
@@ -17,6 +17,7 @@
#include "services/ui/ws/display_manager.h"
#include "services/ui/ws/frame_sink_manager_client_binding.h"
#include "services/ui/ws/gpu_host.h"
+#include "services/ui/ws/threaded_image_cursors.h"
#include "services/ui/ws/window_manager_access_policy.h"
#include "services/ui/ws/window_manager_window_tree_factory.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -546,6 +547,18 @@ void TestWindowServerDelegate::OnWillCreateTreeForWindowManager(
: DisplayCreationConfig::MANUAL);
}
+scoped_refptr<base::SingleThreadTaskRunner>&
+TestWindowServerDelegate::GetResourceRunner() {
+ return resource_runner_;
+}
+
+base::WeakPtr<ui::ImageCursors>
+TestWindowServerDelegate::GetImageCursorsWeakPtr() {
+ if (!image_cursors_)
+ image_cursors_ = base::MakeUnique<ui::ImageCursors>();
+ return image_cursors_->GetWeakPtr();
+}
+
// WindowServerTestHelper ---------------------------------------------------
WindowServerTestHelper::WindowServerTestHelper()

Powered by Google App Engine
This is Rietveld 408576698