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

Unified Diff: ash/display/display_manager.h

Issue 12254040: Revert 182494 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 10 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/display/display_controller.cc ('k') | ash/display/display_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/display_manager.h
===================================================================
--- ash/display/display_manager.h (revision 182530)
+++ ash/display/display_manager.h (working copy)
@@ -59,6 +59,8 @@
bool IsInternalDisplayId(int64 id) const;
+ uint64 internal_display_id() const { return internal_display_id_; }
+
bool UpdateWorkAreaOfDisplayNearestWindow(const aura::Window* window,
const gfx::Insets& insets);
@@ -187,6 +189,8 @@
DisplayList displays_;
+ int64 internal_display_id_;
+
// An internal display cache used when the internal display is disconnectd.
scoped_ptr<gfx::Display> internal_display_;
Property changes on: ash/display/display_manager.h
___________________________________________________________________
Added: svn:mergeinfo
« no previous file with comments | « ash/display/display_controller.cc ('k') | ash/display/display_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698