diff options
| author | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-26 04:59:55 +0000 |
|---|---|---|
| committer | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-26 04:59:55 +0000 |
| commit | a3d215ec60d3a3f1e9316e240d4b14d2a28426fc (patch) | |
| tree | 725ca09d1c06ff5c2978a95ef555afd84db3e2e9 /ui | |
| parent | 2e9c03123ccc0716348e53fb7d0bf63df154eae0 (diff) | |
| download | chromium_src-a3d215ec60d3a3f1e9316e240d4b14d2a28426fc.zip chromium_src-a3d215ec60d3a3f1e9316e240d4b14d2a28426fc.tar.gz chromium_src-a3d215ec60d3a3f1e9316e240d4b14d2a28426fc.tar.bz2 | |
app_shell: Add ShellDesktopController.
This moves screen/desktop/Aura-related code from
ShellBrowserMainParts into a new class,
ShellDesktopController.
When running on Chrome OS, the new class creates an
OutputController and observes it so it can make the Aura
root window match the display's resolution.
BUG=353200
Review URL: https://codereview.chromium.org/206883004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259495 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/display/chromeos/output_configurator.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ui/display/chromeos/output_configurator.cc b/ui/display/chromeos/output_configurator.cc index cd95866..e840413 100644 --- a/ui/display/chromeos/output_configurator.cc +++ b/ui/display/chromeos/output_configurator.cc @@ -912,6 +912,8 @@ OutputState OutputConfigurator::ChooseOutputState( // state so that its native mode will be used. return OUTPUT_STATE_SINGLE; } else { + if (!state_controller_) + return OUTPUT_STATE_DUAL_EXTENDED; // With either both outputs on or both outputs off, use one of the // dual modes. std::vector<int64> display_ids; |