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

Unified Diff: ui/display/display_list.h

Issue 2522563002: Remove unnecessary display:: namespaces. (Closed)
Patch Set: Rebase. 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 | « no previous file | 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/display/display_list.h b/ui/display/display_list.h
index 0401f1c9496b3487d854ccac26d72daa35a2b605..630e4a54e8e9abc8b88b72d20fcf0524e971fac1 100644
--- a/ui/display/display_list.h
+++ b/ui/display/display_list.h
@@ -35,12 +35,12 @@ class DISPLAY_EXPORT DisplayListObserverLock {
DISALLOW_COPY_AND_ASSIGN(DisplayListObserverLock);
};
-// 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.
+// Maintains an ordered list of Displays as well as operations to add, remove
+// and update said list. Additionally maintains DisplayObservers and updates
+// them as appropriate.
class DISPLAY_EXPORT DisplayList {
public:
- using Displays = std::vector<display::Display>;
+ using Displays = std::vector<Display>;
enum class Type {
PRIMARY,
@@ -50,8 +50,8 @@ class DISPLAY_EXPORT DisplayList {
DisplayList();
~DisplayList();
- void AddObserver(display::DisplayObserver* observer);
- void RemoveObserver(display::DisplayObserver* observer);
+ void AddObserver(DisplayObserver* observer);
+ void RemoveObserver(DisplayObserver* observer);
const Displays& displays() const { return displays_; }
@@ -65,21 +65,19 @@ class DISPLAY_EXPORT DisplayList {
std::unique_ptr<DisplayListObserverLock> SuspendObserverUpdates();
// Updates the cached display based on display.id().
- void UpdateDisplay(const display::Display& display);
+ void UpdateDisplay(const Display& display);
// Updates the cached display based on display.id(). Also updates the primary
// display if |type| indicates |display| is the primary display.
- void UpdateDisplay(const display::Display& display, Type type);
+ void UpdateDisplay(const Display& display, Type type);
// Adds a new Display.
- void AddDisplay(const display::Display& display, Type type);
+ void AddDisplay(const Display& display, Type type);
// Removes the Display with the specified id.
void RemoveDisplay(int64_t id);
- base::ObserverList<display::DisplayObserver>* observers() {
- return &observers_;
- }
+ base::ObserverList<DisplayObserver>* observers() { return &observers_; }
private:
friend class DisplayListObserverLock;
@@ -94,9 +92,9 @@ class DISPLAY_EXPORT DisplayList {
Displays::iterator FindDisplayByIdInternal(int64_t id);
- std::vector<display::Display> displays_;
+ std::vector<Display> displays_;
int primary_display_index_ = -1;
- base::ObserverList<display::DisplayObserver> observers_;
+ base::ObserverList<DisplayObserver> observers_;
int observer_suspend_lock_count_ = 0;
« no previous file with comments | « no previous file | ui/display/display_list.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698