diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-02 21:02:43 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-02 21:02:43 +0000 |
| commit | d0f852dfdd260443a3e98a86671711775af15286 (patch) | |
| tree | cd6c2d956b7f22ad1e1ab3062eb450bed12e5bbf /chromeos | |
| parent | ebb72f41f248f2283a3cf30d45bb8d5a40445e31 (diff) | |
| download | chromium_src-d0f852dfdd260443a3e98a86671711775af15286.zip chromium_src-d0f852dfdd260443a3e98a86671711775af15286.tar.gz chromium_src-d0f852dfdd260443a3e98a86671711775af15286.tar.bz2 | |
Revert r159105 "This is the 3 following CLs collapsed as one (for easier merge in M23)"
It has marged to 23, so reverting this on TOT to re-enable Extended Desktop
TBR=saintlou@chromium.org
BUG=152003
TEST=none
Review URL: https://chromiumcodereview.appspot.com/11050002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159762 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos')
| -rw-r--r-- | chromeos/display/output_configurator.cc | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/chromeos/display/output_configurator.cc b/chromeos/display/output_configurator.cc index 66a5b17..6fb573a 100644 --- a/chromeos/display/output_configurator.cc +++ b/chromeos/display/output_configurator.cc @@ -255,11 +255,9 @@ 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 = - name.find(kInternal_LVDS) == 0 || name.find(kInternal_eDP) == 0; + OutputConfigurator::IsInternalOutputName( + std::string(output_info->name)); VLOG(1) << "Found display #" << found_count << " with output " << (int)to_populate->output @@ -377,13 +375,8 @@ static OutputState GetNextState(Display* display, (0 != outputs[1].mirror_mode); switch (current_state) { case 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; + state = + mirror_supported ? STATE_DUAL_MIRROR : STATE_DUAL_PRIMARY_ONLY; break; case STATE_DUAL_MIRROR: state = STATE_DUAL_PRIMARY_ONLY; @@ -841,9 +834,7 @@ void OutputConfigurator::RemoveObserver(Observer* observer) { // static bool OutputConfigurator::IsInternalOutputName(const std::string& name) { - // TODO(oshima): There is only one display for m23 and no need to - // distinguish internal display. - return false; + return name.find(kInternal_LVDS) == 0 || name.find(kInternal_eDP) == 0; } void OutputConfigurator::NotifyOnDisplayChanged() { |