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

Unified Diff: ui/display/display_list.h

Issue 2314203002: Move DisplayList to display; add ScreenBase. (Closed)
Patch Set: Update unit test namespace. Created 4 years, 3 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 | « ui/display/BUILD.gn ('k') | ui/display/display_list.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/display/display_list.h
diff --git a/ui/views/mus/display_list.h b/ui/display/display_list.h
similarity index 85%
rename from ui/views/mus/display_list.h
rename to ui/display/display_list.h
index 19b0ac97f11bde342082075527285a71d31830d6..c4b96ece813600a00358a2ee82945de0c14a576b 100644
--- a/ui/views/mus/display_list.h
+++ b/ui/display/display_list.h
@@ -2,29 +2,26 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef UI_VIEWS_MUS_DISPLAY_LIST_H_
-#define UI_VIEWS_MUS_DISPLAY_LIST_H_
+#ifndef UI_DISPLAY_DISPLAY_LIST_H_
+#define UI_DISPLAY_DISPLAY_LIST_H_
#include <stdint.h>
#include <vector>
#include "base/observer_list.h"
-#include "mojo/public/cpp/bindings/binding.h"
#include "ui/display/display.h"
-#include "ui/views/mus/mus_export.h"
+#include "ui/display/display_export.h"
namespace display {
+
class Display;
class DisplayObserver;
-}
-
-namespace views {
// Maintains an ordered list of display::Displays as well as operations to add,
// remove and update said list. Additionally maintains display::DisplayObservers
// and updates them as appropriate.
-class VIEWS_MUS_EXPORT DisplayList {
+class DISPLAY_EXPORT DisplayList {
public:
using Displays = std::vector<display::Display>;
@@ -64,6 +61,6 @@ class VIEWS_MUS_EXPORT DisplayList {
DISALLOW_COPY_AND_ASSIGN(DisplayList);
};
-} // namespace views
+} // namespace display
-#endif // UI_VIEWS_MUS_DISPLAY_LIST_H_
+#endif // UI_DISPLAY_DISPLAY_LIST_H_
« no previous file with comments | « ui/display/BUILD.gn ('k') | ui/display/display_list.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698