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

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

Issue 2189893004: Unify display ids between Display and PlatformDisplay. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Back to pure virtual. Created 4 years, 5 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 | « no previous file | services/ui/ws/display.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/ws/display.h
diff --git a/services/ui/ws/display.h b/services/ui/ws/display.h
index 25bd577103ab98ecf467f1be44ad56b4fb636f04..b7c239247d7e62a9fab03e6015e6124c2129041c 100644
--- a/services/ui/ws/display.h
+++ b/services/ui/ws/display.h
@@ -66,7 +66,7 @@ class Display : public PlatformDisplayDelegate,
// Initializes state that depends on the existence of a Display.
void Init(std::unique_ptr<DisplayBinding> binding);
- uint32_t id() const { return id_; }
+ int64_t GetId() const;
DisplayManager* display_manager();
const DisplayManager* display_manager() const;
@@ -91,9 +91,6 @@ class Display : public PlatformDisplayDelegate,
::display::Display::Rotation GetRotation() const;
gfx::Size GetSize() const;
- // Returns the id for the corresponding id.
- int64_t GetPlatformDisplayId() const;
-
WindowServer* window_server() { return window_server_; }
// Returns the root of the Display. The root's children are the roots
@@ -200,7 +197,6 @@ class Display : public PlatformDisplayDelegate,
void OnWindowManagerWindowTreeFactoryReady(
WindowManagerWindowTreeFactory* factory) override;
- const uint32_t id_;
std::unique_ptr<DisplayBinding> binding_;
// Set once Init() has been called.
bool init_called_ = false;
« no previous file with comments | « no previous file | services/ui/ws/display.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698