diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-20 00:48:56 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-20 00:48:56 +0000 |
| commit | c73d74eb53466415fe151a78f6f6b673f50bdd9e (patch) | |
| tree | 05ddc62e480f24e2ff19f34a8df0c6b26f057c7d /ash/screen_ash.cc | |
| parent | b0628ad0bd4ddc6c34d0f4edfd32aa74ba4821ab (diff) | |
| download | chromium_src-c73d74eb53466415fe151a78f6f6b673f50bdd9e.zip chromium_src-c73d74eb53466415fe151a78f6f6b673f50bdd9e.tar.gz chromium_src-c73d74eb53466415fe151a78f6f6b673f50bdd9e.tar.bz2 | |
Fix crashers in GetPrimaryDisplay
- Store primary display info in global object as this will be accessed after Shell is deleted during shutdown.
- Don't touch UI/aura/ash in HandleAppExitingForPlatform if Shell is not initialized yet. This can happen when XIOError occurs during startup.
BUG=150633,150781
TEST=no crash report
Review URL: https://chromiumcodereview.appspot.com/10952028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157671 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/screen_ash.cc')
| -rw-r--r-- | ash/screen_ash.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/screen_ash.cc b/ash/screen_ash.cc index e72dfb17..efda022 100644 --- a/ash/screen_ash.cc +++ b/ash/screen_ash.cc @@ -117,7 +117,7 @@ gfx::Display ScreenAsh::GetDisplayMatching(const gfx::Rect& match_rect) const { } gfx::Display ScreenAsh::GetPrimaryDisplay() const { - return Shell::GetInstance()->display_controller()->primary_display(); + return DisplayController::GetPrimaryDisplay(); } } // namespace ash |