Adds (native) annotation to the display settings.

ash/display/display_change_observer_chromeos.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/display/display_change_observer_chromeos.h"
 
 #include <algorithm>
 #include <map>
 #include <set>
 #include <vector>
@@ skipping 66 matching lines @@
   DisplayMode native_mode(ui_native_mode->size(),
                           ui_native_mode->refresh_rate(),
                           ui_native_mode->is_interlaced(),
                           true);
   native_mode.device_scale_factor = display_info.device_scale_factor();
   std::vector<float> ui_scales =
       DisplayManager::GetScalesForDisplay(display_info);
   for (size_t i = 0; i < ui_scales.size(); ++i) {
     DisplayMode mode = native_mode;
     mode.ui_scale = ui_scales[i];
-    mode.native = (ui_scales[i] == 1.0f);
+    if (display_info.device_scale_factor() == 2.0f) {
+      mode.native = (ui_scales[i] == 2.0f);
+    } else {
+      mode.native = (ui_scales[i] == 1.0f);
+    }

[oshima, 2014/09/12 17:23:49]

this should be

mode.native = (ui_scales[i] == device_scale_factor())

shouldn't it?

[Jun Mukai, 2014/09/12 18:50:55]

right, done.  also added the test case of dsf == 1.25.  I'm always confused by
this case... :-/

     display_mode_list.push_back(mode);
   }
 
   std::sort(
       display_mode_list.begin(), display_mode_list.end(), DisplayModeSorter());
   return display_mode_list;
 }
 
 // static
 std::vector<DisplayMode> DisplayChangeObserver::GetExternalDisplayModeList(
@@ skipping 158 matching lines @@
 // static
 float DisplayChangeObserver::FindDeviceScaleFactor(float dpi) {
   for (size_t i = 0; i < arraysize(kThresholdTable); ++i) {
     if (dpi > kThresholdTable[i].dpi)
       return kThresholdTable[i].device_scale_factor;
   }
   return 1.0f;
 }
 
 }  // namespace ash