| 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
|
|
|
|
|