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

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

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.h
diff --git a/services/ui/ws/test_utils.h b/services/ui/ws/test_utils.h
index 1734541e7a5edbe2bab807608b77a2eb959e994f..ff63b0a10476cdf347c06925f2622f36f243f217 100644
--- a/services/ui/ws/test_utils.h
+++ b/services/ui/ws/test_utils.h
@@ -607,6 +607,8 @@ class TestWindowServerDelegate : public WindowServerDelegate {
bool IsTestConfig() const override;
void OnWillCreateTreeForWindowManager(
bool automatically_create_display_roots) override;
+ scoped_refptr<base::SingleThreadTaskRunner>& GetResourceRunner() override;
+ base::WeakPtr<ui::ImageCursors> GetImageCursorsWeakPtr() override;
private:
WindowServer* window_server_ = nullptr;
@@ -614,6 +616,8 @@ class TestWindowServerDelegate : public WindowServerDelegate {
// All TestWindowTreeBinding objects created via CreateWindowTreeBinding.
// These are owned by the corresponding WindowTree.
std::vector<TestWindowTreeBinding*> bindings_;
+ scoped_refptr<base::SingleThreadTaskRunner> resource_runner_ = nullptr;
+ std::unique_ptr<ui::ImageCursors> image_cursors_;
DISALLOW_COPY_AND_ASSIGN(TestWindowServerDelegate);
};

Powered by Google App Engine
This is Rietveld 408576698