Chromium Code Reviews| Index: ash/display/display_manager.h |
| diff --git a/ash/display/display_manager.h b/ash/display/display_manager.h |
| index 56834d579cf35353ff9d20341ba5e75671cbb7ad..f9a27e23f70e8bbc5ca841d460c2f49ce82e3d7a 100644 |
| --- a/ash/display/display_manager.h |
| +++ b/ash/display/display_manager.h |
| @@ -59,8 +59,6 @@ class ASH_EXPORT DisplayManager : public aura::RootWindowObserver { |
| bool IsInternalDisplayId(int64 id) const; |
| - uint64 internal_display_id() const { return internal_display_id_; } |
| - |
| bool UpdateWorkAreaOfDisplayNearestWindow(const aura::Window* window, |
| const gfx::Insets& insets); |
| @@ -171,6 +169,9 @@ class ASH_EXPORT DisplayManager : public aura::RootWindowObserver { |
| // the internal display. |
| int64 SetFirstDisplayAsInternalDisplayForTest(); |
| + // Reset the internal display id after test finishes. |
| + void ResetInternalDisplayForTest(); |
|
oshima
2013/02/12 17:38:51
If you want to keep this, then please move this to
ynovikov
2013/02/12 21:17:47
Done.
|
| + |
| // Checks if the mouse pointer is on one of displays, and moves to |
| // the center of the nearest display if it's outside of all displays. |
| void EnsurePointerInDisplays(); |
| @@ -189,8 +190,6 @@ class ASH_EXPORT DisplayManager : public aura::RootWindowObserver { |
| DisplayList displays_; |
| - int64 internal_display_id_; |
| - |
| // An internal display cache used when the internal display is disconnectd. |
| scoped_ptr<gfx::Display> internal_display_; |