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

Unified Diff: ash/system/chromeos/tray_display.cc

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/event_transformation_handler.cc ('k') | ash/test/ash_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/chromeos/tray_display.cc
===================================================================
--- ash/system/chromeos/tray_display.cc (revision 182530)
+++ ash/system/chromeos/tray_display.cc (working copy)
@@ -86,7 +86,7 @@
string16 GetExternalDisplayName() {
#if defined(USE_X11)
DisplayManager* display_manager = Shell::GetInstance()->display_manager();
- int64 internal_display_id = gfx::Display::InternalDisplayId();
+ int64 internal_display_id = display_manager->internal_display_id();
int64 primary_display_id =
gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().id();
Property changes on: ash/system/chromeos/tray_display.cc
___________________________________________________________________
Added: svn:mergeinfo
« no previous file with comments | « ash/display/event_transformation_handler.cc ('k') | ash/test/ash_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698