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

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

Issue 2484223006: Remove CreateDefaultDisplay(). (Closed)
Patch Set: Remove debug LOG. Created 4 years, 1 month 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 | « services/ui/ws/display_unittest.cc ('k') | services/ui/ws/test_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/ws/test_utils.h
diff --git a/services/ui/ws/test_utils.h b/services/ui/ws/test_utils.h
index 8588d0da2f500de27b910d873069fa192282e32e..dee4b23b93fe5641498b19435e14cb444e839dc5 100644
--- a/services/ui/ws/test_utils.h
+++ b/services/ui/ws/test_utils.h
@@ -522,10 +522,6 @@ class TestWindowServerDelegate : public WindowServerDelegate {
window_server_ = window_server;
}
- void set_num_displays_to_create(int count) {
- num_displays_to_create_ = count;
- }
-
TestWindowTreeClient* last_client() {
return last_binding() ? last_binding()->client() : nullptr;
}
@@ -537,6 +533,9 @@ class TestWindowServerDelegate : public WindowServerDelegate {
bool got_on_no_more_displays() const { return got_on_no_more_displays_; }
+ // Creates |num_displays| displays.
+ void CreateDisplays(int num_displays);
+
Display* AddDisplay();
// WindowServerDelegate:
@@ -547,14 +546,10 @@ class TestWindowServerDelegate : public WindowServerDelegate {
ws::WindowTree* tree,
mojom::WindowTreeRequest* tree_request,
mojom::WindowTreeClientPtr* client) override;
- void CreateDefaultDisplays() override;
bool IsTestConfig() const override;
void UpdateTouchTransforms() override {}
private:
- // If CreateDefaultDisplays() this is the number of Displays that are
- // created. The default is 0, which results in a DCHECK.
- int num_displays_to_create_ = 0;
WindowServer* window_server_ = nullptr;
bool got_on_no_more_displays_ = false;
// All TestWindowTreeBinding objects created via CreateWindowTreeBinding.
« no previous file with comments | « services/ui/ws/display_unittest.cc ('k') | services/ui/ws/test_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698