diff options
| author | isherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-14 20:49:37 +0000 |
|---|---|---|
| committer | isherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-14 20:49:37 +0000 |
| commit | eaabd1961b91102887ba585c789291f6d3139ae7 (patch) | |
| tree | 60efed703fff83a2655f0ae1f356c5f4ebf94c28 /ash/system | |
| parent | 7eb22b2a5d24d5fec70814dfee398cc0b17ce82b (diff) | |
| download | chromium_src-eaabd1961b91102887ba585c789291f6d3139ae7.zip chromium_src-eaabd1961b91102887ba585c789291f6d3139ae7.tar.gz chromium_src-eaabd1961b91102887ba585c789291f6d3139ae7.tar.bz2 | |
Revert 182494
Introduced new static initializers on Linux.
> 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
TBR=ynovikov@chromium.org
Review URL: https://codereview.chromium.org/12254040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182531 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system')
| -rw-r--r-- | ash/system/chromeos/tray_display.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/system/chromeos/tray_display.cc b/ash/system/chromeos/tray_display.cc index dbed1e7..dd75fed 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 = gfx::Display::InternalDisplayId(); + int64 internal_display_id = display_manager->internal_display_id(); int64 primary_display_id = gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().id(); |