diff options
| author | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-27 20:35:27 +0000 |
|---|---|---|
| committer | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-27 20:35:27 +0000 |
| commit | e5f47d3f9c2b4118e2f4df500573048283c76957 (patch) | |
| tree | e76b477d84034c4f602f641a8d8cef41c8b5a69f /chromeos | |
| parent | 252f86be785920b4ed67f0e194e5833ad0c88142 (diff) | |
| download | chromium_src-e5f47d3f9c2b4118e2f4df500573048283c76957.zip chromium_src-e5f47d3f9c2b4118e2f4df500573048283c76957.tar.gz chromium_src-e5f47d3f9c2b4118e2f4df500573048283c76957.tar.bz2 | |
This is the 3 following CLs collapsed as one (for easier merge in M23)
http://src.chromium.org/viewvc/chrome?view=rev&revision=158546
http://src.chromium.org/viewvc/chrome?view=rev&revision=158721
http://src.chromium.org/viewvc/chrome?view=rev&revision=158771
NOTE: this can only be landed *after* this has landed: https://codereview.chromium.org/10990091/
BUG=152003
TBR=oshima@chromium.org,derat@chromium.org,sky@chromium.org,jhorwich@chromium.org
Review URL: https://codereview.chromium.org/10993062
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159105 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos')
| -rw-r--r-- | chromeos/display/output_configurator.cc | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/chromeos/display/output_configurator.cc b/chromeos/display/output_configurator.cc index 6fb573a..66a5b17 100644 --- a/chromeos/display/output_configurator.cc +++ b/chromeos/display/output_configurator.cc @@ -255,9 +255,11 @@ static int GetDualOutputs(Display* display, to_populate->mirror_mode = 0; // See if this output refers to an internal display. + // TODO(oshmia): Use |IsInternalOutputName| once the change is merged + // to m23. crbug.com/152003. + const std::string name(output_info->name); to_populate->is_internal = - OutputConfigurator::IsInternalOutputName( - std::string(output_info->name)); + name.find(kInternal_LVDS) == 0 || name.find(kInternal_eDP) == 0; VLOG(1) << "Found display #" << found_count << " with output " << (int)to_populate->output @@ -375,8 +377,13 @@ static OutputState GetNextState(Display* display, (0 != outputs[1].mirror_mode); switch (current_state) { case STATE_DUAL_PRIMARY_ONLY: - state = - mirror_supported ? STATE_DUAL_MIRROR : STATE_DUAL_PRIMARY_ONLY; + // TODO(oshima): Temporarily disable extended + // desktop. crbug.com/152003. + state = STATE_DUAL_SECONDARY_ONLY; + break; + case STATE_DUAL_SECONDARY_ONLY: + state = mirror_supported ? + STATE_DUAL_MIRROR : STATE_DUAL_PRIMARY_ONLY; break; case STATE_DUAL_MIRROR: state = STATE_DUAL_PRIMARY_ONLY; @@ -834,7 +841,9 @@ void OutputConfigurator::RemoveObserver(Observer* observer) { // static bool OutputConfigurator::IsInternalOutputName(const std::string& name) { - return name.find(kInternal_LVDS) == 0 || name.find(kInternal_eDP) == 0; + // TODO(oshima): There is only one display for m23 and no need to + // distinguish internal display. + return false; } void OutputConfigurator::NotifyOnDisplayChanged() { |