Polish "Displays" Options UI for ChromeOS.

chrome/browser/ui/webui/options2/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/options2/chromeos/display_options_handler.h"
 
 #include <string>
 
 #include "ash/display/display_controller.h"
 #include "ash/display/output_configurator_animation.h"
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/json/json_value_converter.h"
 #include "base/logging.h"
+#include "base/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/display/output_configurator.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/generated_resources.h"
 #include "ui/aura/env.h"
 #include "ui/aura/display_manager.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 15 matching lines @@
 
 void DisplayOptionsHandler::GetLocalizedValues(
     DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
   RegisterTitle(localized_strings, "displayOptionsPage",
                 IDS_OPTIONS_SETTINGS_DISPLAY_OPTIONS_TAB_TITLE);
   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("applyButton", l10n_util::GetStringUTF16(
+      IDS_OPTIONS_SETTINGS_DISPLAY_OPTIONS_APPLY_BUTTON));
+  localized_strings->SetString("resolution", l10n_util::GetStringUTF16(
+      IDS_OPTIONS_SETTINGS_DISPLAY_OPTIONS_RESOLUTION));
 }
 
 void DisplayOptionsHandler::InitializeHandler() {
   DCHECK(web_ui());
   UpdateDisplaySectionVisibility();
 }
 
 void DisplayOptionsHandler::RegisterMessages() {
   web_ui()->RegisterMessageCallback(
       "getDisplayInfo",
@@ skipping 47 matching lines @@
   base::ListValue displays;
   for (size_t i = 0; i < display_manager->GetNumDisplays(); ++i) {
     const gfx::Display* display = display_manager->GetDisplayAt(i);
     const gfx::Rect& bounds = display->bounds();
     base::DictionaryValue* js_display = new base::DictionaryValue();
     js_display->SetDouble("id", display->id());
     js_display->SetDouble("x", bounds.x());
     js_display->SetDouble("y", bounds.y());
     js_display->SetDouble("width", bounds.width());
     js_display->SetDouble("height", bounds.height());
+    // We do not have good data for displays such like vendor/model names.

[James Hawkins, 2012/08/03 18:08:23]

s/We/.../

[Jun Mukai, 2012/08/06 08:07:32]

Done.

+    // So here just uses 'Display 1' or 'Display 2' for their names.
+    // TODO(mukai,oshima): support vendor/model names and use it.
+    js_display->SetString("name", base::StringPrintf(
+        "Display %d", static_cast<int>(i) + 1));
     displays.Set(i, js_display);
   }
 
   PrefService* pref_service = Profile::FromWebUI(web_ui())->GetPrefs();
   base::FundamentalValue layout(
       pref_service->GetInteger(prefs::kSecondaryDisplayLayout));
 
   web_ui()->CallJavascriptFunction(
       "options.DisplayOptions.setDisplayInfo",
       mirroring, displays, layout);
@@ skipping 43 matching lines @@
   DCHECK_GE(DisplayController::LEFT, layout);
   ash::Shell::GetInstance()->output_configurator_animation()->
       StartFadeOutAnimation(base::Bind(
           &DisplayOptionsHandler::FadeOutForDisplayLayoutFinished,
           base::Unretained(this),
           static_cast<int>(layout)));
 }
 
 }  // namespace options2
 }  // namespace chromeos