diff options
| author | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-27 20:29:37 +0000 |
|---|---|---|
| committer | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-27 20:29:37 +0000 |
| commit | 272da0e29a61a2fd7991eda8c8d3d4c55416b2b0 (patch) | |
| tree | f49e64469b88466771c8a8ce641f5785077013a8 /chromeos | |
| parent | bd309ee68c9e457da3e86a56f344d55573591032 (diff) | |
| download | chromium_src-272da0e29a61a2fd7991eda8c8d3d4c55416b2b0.zip chromium_src-272da0e29a61a2fd7991eda8c8d3d4c55416b2b0.tar.gz chromium_src-272da0e29a61a2fd7991eda8c8d3d4c55416b2b0.tar.bz2 | |
Reverting 3 CLs in order to create 1 CL (to be later merged 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
BUG=152003
TBR=oshima@chromium.org,derat@chromium.org,sky@chromium.org,jhorwich@chromium.org
Review URL: https://codereview.chromium.org/10990091
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159102 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() { |