Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6700)

Unified Diff: chrome/browser/ui/webui/options2/chromeos/display_options_handler.cc

Issue 10843066: Polish "Displays" Options UI for ChromeOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/resources/options2/chromeos/display_options.js ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/options2/chromeos/display_options_handler.cc
diff --git a/chrome/browser/ui/webui/options2/chromeos/display_options_handler.cc b/chrome/browser/ui/webui/options2/chromeos/display_options_handler.cc
index a60e8321b7e6b69032d70e54520975e8b54f9515..1607f70499c22aaade5dace557ac460d2e476680 100644
--- a/chrome/browser/ui/webui/options2/chromeos/display_options_handler.cc
+++ b/chrome/browser/ui/webui/options2/chromeos/display_options_handler.cc
@@ -12,6 +12,7 @@
#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"
@@ -47,6 +48,10 @@ void DisplayOptionsHandler::GetLocalizedValues(
IDS_OPTIONS_SETTINGS_DISPLAY_OPTIONS_START_MIRRORING));
localized_strings->SetString("stopMirroring", l10n_util::GetStringUTF16(
IDS_OPTIONS_SETTINGS_DISPLAY_OPTIONS_STOP_MIRRORING));
+ localized_strings->SetString("applyResult", l10n_util::GetStringUTF16(
+ IDS_OPTIONS_SETTINGS_DISPLAY_OPTIONS_APPLY_RESULT));
+ localized_strings->SetString("resolution", l10n_util::GetStringUTF16(
+ IDS_OPTIONS_SETTINGS_DISPLAY_OPTIONS_RESOLUTION));
}
void DisplayOptionsHandler::InitializePage() {
@@ -114,6 +119,11 @@ void DisplayOptionsHandler::SendDisplayInfo() {
js_display->SetDouble("y", bounds.y());
js_display->SetDouble("width", bounds.width());
js_display->SetDouble("height", bounds.height());
+ // Do not have good data for displays such like vendor/model names.
+ // 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);
}
« no previous file with comments | « chrome/browser/resources/options2/chromeos/display_options.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698