Adds (native) annotation to the display settings.

chrome/browser/ui/webui/options/chromeos/display_options_handler.cc

 // Copyright (c) 2012 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 "chrome/browser/ui/webui/options/chromeos/display_options_handler.h"
 
 #include <string>
 
 #include "ash/display/display_configurator_animation.h"
 #include "ash/display/display_controller.h"
@@ skipping 105 matching lines @@
   }
   if (!GetFloat(dict, "deviceScaleFactor", &mode->device_scale_factor)) {
     LOG(ERROR) << "missing deviceScaleFactor.";
     return false;
   }
   return true;
 }
 
 base::DictionaryValue* ConvertDisplayModeToValue(int64 display_id,
                                                  const ash::DisplayMode& mode) {
+  bool is_internal = GetDisplayManager()->IsInternalDisplayId(display_id);
   base::DictionaryValue* result = new base::DictionaryValue();
   gfx::Size size_dip = mode.GetSizeInDIP();
   result->SetInteger("width", size_dip.width());
   result->SetInteger("height", size_dip.height());
   result->SetInteger("originalWidth", mode.size.width());
   result->SetInteger("originalHeight", mode.size.height());
   result->SetDouble("deviceScaleFactor", mode.device_scale_factor);
   result->SetDouble("scale", mode.ui_scale);
   result->SetDouble("refreshRate", mode.refresh_rate);
-  result->SetBoolean("isBest", mode.native);
+  result->SetBoolean(
+      "isBest", is_internal ? (mode.ui_scale == 1.0f) : mode.native);
+  result->SetBoolean("isNative", mode.native);
   result->SetBoolean(
       "selected", mode.IsEquivalent(
           GetDisplayManager()->GetActiveModeForDisplayId(display_id)));
   return result;
 }
 
 }  // namespace
 
 DisplayOptionsHandler::DisplayOptionsHandler() {
   ash::Shell::GetInstance()->display_controller()->AddObserver(this);
@@ skipping 25 matching lines @@
   localized_strings->SetString("startMirroring", l10n_util::GetStringUTF16(
       IDS_OPTIONS_SETTINGS_DISPLAY_OPTIONS_START_MIRRORING));
   localized_strings->SetString("stopMirroring", l10n_util::GetStringUTF16(
       IDS_OPTIONS_SETTINGS_DISPLAY_OPTIONS_STOP_MIRRORING));
   localized_strings->SetString("mirroringDisplay", l10n_util::GetStringUTF16(
       IDS_OPTIONS_SETTINGS_DISPLAY_OPTIONS_MIRRORING_DISPLAY_NAME));
   localized_strings->SetString("setPrimary", l10n_util::GetStringUTF16(
       IDS_OPTIONS_SETTINGS_DISPLAY_OPTIONS_SET_PRIMARY));
   localized_strings->SetString("annotateBest", l10n_util::GetStringUTF16(
       IDS_OPTIONS_SETTINGS_DISPLAY_OPTIONS_RESOLUTION_ANNOTATION_BEST));
+  localized_strings->SetString("annotateNative", l10n_util::GetStringUTF16(
+      IDS_OPTIONS_SETTINGS_DISPLAY_OPTIONS_RESOLUTION_ANNOTATION_NATIVE));
   localized_strings->SetString("orientation0", l10n_util::GetStringUTF16(
       IDS_OPTIONS_SETTINGS_DISPLAY_OPTIONS_STANDARD_ORIENTATION));
   localized_strings->SetString("orientation90", l10n_util::GetStringUTF16(
       IDS_ASH_STATUS_TRAY_DISPLAY_ORIENTATION_90));
   localized_strings->SetString("orientation180", l10n_util::GetStringUTF16(
       IDS_ASH_STATUS_TRAY_DISPLAY_ORIENTATION_180));
   localized_strings->SetString("orientation270", l10n_util::GetStringUTF16(
       IDS_ASH_STATUS_TRAY_DISPLAY_ORIENTATION_270));
   localized_strings->SetString(
       "startCalibratingOverscan", l10n_util::GetStringUTF16(
@@ skipping 259 matching lines @@
     return;
   }
 
   GetDisplayManager()->SetColorCalibrationProfile(
       display_id, static_cast<ui::ColorCalibrationProfile>(profile_id));
   SendAllDisplayInfo();
 }
 
 }  // namespace options
 }  // namespace chromeos