| Index: ash/display/multi_display_manager.h
|
| diff --git a/ash/display/multi_display_manager.h b/ash/display/multi_display_manager.h
|
| index 79886465c15de9717f4164cfd655474363fd0a01..703c3414ee1bacccac0200056e79f108d506c047 100644
|
| --- a/ash/display/multi_display_manager.h
|
| +++ b/ash/display/multi_display_manager.h
|
| @@ -64,6 +64,10 @@ class ASH_EXPORT MultiDisplayManager : public aura::DisplayManager,
|
| bool UpdateWorkAreaOfDisplayNearestWindow(const aura::Window* window,
|
| const gfx::Insets& insets);
|
|
|
| + // Returns the list of currently connected display names. It doesn't
|
| + // contain the name for the internal display.
|
| + std::vector<std::string> GetExternalDisplayNames() const;
|
| +
|
| // Returns display for given |id|;
|
| const gfx::Display& GetDisplayForId(int64 id) const;
|
|
|
| @@ -134,6 +138,9 @@ class ASH_EXPORT MultiDisplayManager : public aura::DisplayManager,
|
| // the center of the nearest display if it's outside of all displays.
|
| void EnsurePointerInDisplays();
|
|
|
| + // Updates |display_names_| by calling platform-dependent functions.
|
| + void RefreshDisplayNames();
|
| +
|
| // Update the display's id in the |display_list| to match the ones
|
| // stored in this display manager's |displays_|. This is used to
|
| // emulate display change behavior during the test byn creating the
|
| @@ -152,6 +159,9 @@ class ASH_EXPORT MultiDisplayManager : public aura::DisplayManager,
|
| // The mapping from the display ID to its overscan insets.
|
| std::map<int64, gfx::Insets> overscan_mapping_;
|
|
|
| + // The cached display's name for the display ID.
|
| + std::map<int64, std::string> display_names_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(MultiDisplayManager);
|
| };
|
|
|
|
|