| 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;
|
|
|
|
|