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

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

Issue 2549503002: Rename PlatformScreen to ScreenManager. (Closed)
Patch Set: Created 4 years 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 bf2bc0e4f9194b4078e19ed5fc7f578faae1420a..cb566dbcbb243ad7a433eade0f904942d3e0af4b 100644
--- a/services/ui/ws/test_utils.h
+++ b/services/ui/ws/test_utils.h
@@ -13,7 +13,7 @@
#include "base/memory/ptr_util.h"
#include "base/message_loop/message_loop.h"
-#include "services/ui/display/platform_screen.h"
+#include "services/ui/display/screen_manager.h"
#include "services/ui/display/viewport_metrics.h"
#include "services/ui/public/interfaces/display_manager.mojom.h"
#include "services/ui/public/interfaces/window_tree.mojom.h"
@@ -45,10 +45,10 @@ namespace test {
// Tracks display ids to perform some basic verification that no duplicates are
// added and display was added before being modified or removed. Display ids
// reset when Init() is called.
-class TestPlatformScreen : public display::PlatformScreen {
+class TestScreenManager : public display::ScreenManager {
public:
- TestPlatformScreen();
- ~TestPlatformScreen() override;
+ TestScreenManager();
+ ~TestScreenManager() override;
// Adds a new display with default metrics, generates a unique display id and
// returns it. Calls OnDisplayAdded() on delegate.
@@ -64,18 +64,18 @@ class TestPlatformScreen : public display::PlatformScreen {
// Calls OnDisplayRemoved() on delegate.
void RemoveDisplay(int64_t id);
- // display::PlatformScreen:
+ // display::ScreenManager:
void AddInterfaces(service_manager::InterfaceRegistry* registry) override {}
- void Init(display::PlatformScreenDelegate* delegate) override;
+ void Init(display::ScreenManagerDelegate* delegate) override;
void RequestCloseDisplay(int64_t display_id) override {}
int64_t GetPrimaryDisplayId() const override;
private:
- display::PlatformScreenDelegate* delegate_;
+ display::ScreenManagerDelegate* delegate_;
int64_t primary_display_id_ = display::kInvalidDisplayId;
std::set<int64_t> display_ids_;
- DISALLOW_COPY_AND_ASSIGN(TestPlatformScreen);
+ DISALLOW_COPY_AND_ASSIGN(TestScreenManager);
};
// -----------------------------------------------------------------------------

Powered by Google App Engine
This is Rietveld 408576698