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

Unified Diff: ui/mojo/init/screen_mojo.h

Issue 1407073002: Adds GetDisplays() to WindowManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge 2 trunk Created 5 years, 2 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 | « mojo/converters/network/network_type_converters.cc ('k') | ui/mojo/init/screen_mojo.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/mojo/init/screen_mojo.h
diff --git a/ui/mojo/init/screen_mojo.h b/ui/mojo/init/screen_mojo.h
index db7f48f75f9e37d47674162b5ff46b933e53d243..3a3df0655efe778ee648f0b648355f341afbe508 100644
--- a/ui/mojo/init/screen_mojo.h
+++ b/ui/mojo/init/screen_mojo.h
@@ -5,8 +5,9 @@
#ifndef UI_MOJO_INIT_SCREEN_MOJO_H_
#define UI_MOJO_INIT_SCREEN_MOJO_H_
+#include <vector>
+
#include "ui/gfx/display.h"
-#include "ui/gfx/geometry/size.h"
#include "ui/gfx/screen.h"
namespace ui {
@@ -14,7 +15,8 @@ namespace mojo {
class ScreenMojo : public gfx::Screen {
public:
- ScreenMojo(const gfx::Size& screen_size_in_pixels, float device_pixel_ratio);
+ explicit ScreenMojo(const std::vector<gfx::Display>& displays);
+ ~ScreenMojo() override;
// gfx::Screen:
gfx::Point GetCursorScreenPoint() override;
@@ -30,10 +32,7 @@ class ScreenMojo : public gfx::Screen {
void RemoveObserver(gfx::DisplayObserver* observer) override;
private:
- const gfx::Size screen_size_in_pixels_;
- const float device_pixel_ratio_;
-
- gfx::Display display_;
+ const std::vector<gfx::Display> displays_;
DISALLOW_COPY_AND_ASSIGN(ScreenMojo);
};
« no previous file with comments | « mojo/converters/network/network_type_converters.cc ('k') | ui/mojo/init/screen_mojo.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698