ash/display/multi_display_manager.h - Issue 10826198: Use persistent ID/names for displays.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/display/multi_display_manager.h

Issue 10826198: Use persistent ID/names for displays. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: remove persistent_id() and change id() to int64 Created 8 years, 4 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:

Index: ash/display/multi_display_manager.h

diff --git a/ash/display/multi_display_manager.h b/ash/display/multi_display_manager.h

index 1c29b023029d9d0eb67b4831fb5064e74effa601..c702dfb43b7115ec18efc1861995b8ff4e92f4ec 100644

--- a/ash/display/multi_display_manager.h

+++ b/ash/display/multi_display_manager.h

@@ -59,6 +59,7 @@ class ASH_EXPORT MultiDisplayManager : public aura::DisplayManager,

const aura::Window* window) const OVERRIDE;

virtual const gfx::Display& GetDisplayMatching(

const gfx::Rect& match_rect)const OVERRIDE;

+ virtual std::string GetDisplayNameAt(size_t index) OVERRIDE;

// RootWindowObserver overrides:

virtual void OnRootWindowResized(const aura::RootWindow* root,

@@ -83,7 +84,7 @@ class ASH_EXPORT MultiDisplayManager : public aura::DisplayManager,

DISALLOW_COPY_AND_ASSIGN(MultiDisplayManager);

};

-extern const aura::WindowProperty<int>* const kDisplayIdKey;

+extern const aura::WindowProperty<int64>* const kDisplayIdKey;

} // namespace internal

} // namespace ash