summaryrefslogtreecommitdiffstats
path: root/ash/system
diff options
context:
space:
mode:
authorynovikov@chromium.org <ynovikov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-14 18:22:41 +0000
committerynovikov@chromium.org <ynovikov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-14 18:22:41 +0000
commit722098a42f7af76478c25e92565c9043cef7f606 (patch)
tree084c382efa559c78d94d15733040ba8fedf241ef /ash/system
parent01d43da65b33b3dfd4d86d09ca2c17262ce88c2a (diff)
downloadchromium_src-722098a42f7af76478c25e92565c9043cef7f606.zip
chromium_src-722098a42f7af76478c25e92565c9043cef7f606.tar.gz
chromium_src-722098a42f7af76478c25e92565c9043cef7f606.tar.bz2
Add IsInternal property to gfx::Display
Move knowledge whether a display is internal or not from ash::DisplayManager into gfx::Display. BUG=171310 TEST=ash_unittests, ui_unittests, unit_tests pass Review URL: https://chromiumcodereview.appspot.com/12217120 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182494 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system')
-rw-r--r--ash/system/chromeos/tray_display.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/system/chromeos/tray_display.cc b/ash/system/chromeos/tray_display.cc
index dd75fed..dbed1e7 100644
--- a/ash/system/chromeos/tray_display.cc
+++ b/ash/system/chromeos/tray_display.cc
@@ -86,7 +86,7 @@ class DisplayView : public ash::internal::ActionableView {
string16 GetExternalDisplayName() {
#if defined(USE_X11)
DisplayManager* display_manager = Shell::GetInstance()->display_manager();
- int64 internal_display_id = display_manager->internal_display_id();
+ int64 internal_display_id = gfx::Display::InternalDisplayId();
int64 primary_display_id =
gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().id();