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

Unified Diff: chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

Issue 2802603005: MD Settings: Display: Add unified desktop control and modify api (Closed)
Patch Set: Fix closure and tests Created 3 years, 8 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
Index: chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
diff --git a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
index 647c450ce032b4b8af7545ee9663f5e4953d605c..82eddcb9399e90121d080512ce5071f10e0f5cfa 100644
--- a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
@@ -46,6 +46,7 @@
#include "components/user_manager/user.h"
#include "components/user_manager/user_manager.h"
#include "ui/chromeos/strings/grit/ui_chromeos_strings.h"
+#include "ui/display/display_switches.h"
#else
#include "chrome/browser/ui/webui/settings/system_handler.h"
#endif
@@ -642,8 +643,7 @@ void AddDeviceStrings(content::WebUIDataSource* html_source) {
{"displayArrangementText", IDS_SETTINGS_DISPLAY_ARRANGEMENT_TEXT},
{"displayArrangementTitle", IDS_SETTINGS_DISPLAY_ARRANGEMENT_TITLE},
{"displayMirror", IDS_SETTINGS_DISPLAY_MIRROR},
- {"displayMirrorOff", IDS_SETTINGS_DISPLAY_MIRRORING_OFF},
- {"displayMirrorOn", IDS_SETTINGS_DISPLAY_MIRRORING_ON},
+ {"displayUnfiedDesktop", IDS_SETTINGS_DISPLAY_UNIFIED_DESKTOP},
{"displayResolutionTitle", IDS_SETTINGS_DISPLAY_RESOLUTION_TITLE},
{"displayResolutionText", IDS_SETTINGS_DISPLAY_RESOLUTION_TEXT},
{"displayResolutionTextBest", IDS_SETTINGS_DISPLAY_RESOLUTION_TEXT_BEST},
@@ -665,10 +665,12 @@ void AddDeviceStrings(content::WebUIDataSource* html_source) {
{"displayTouchCalibrationTitle",
IDS_SETTINGS_DISPLAY_TOUCH_CALIBRATION_TITLE},
{"displayTouchCalibrationText",
- IDS_SETTINGS_DISPLAY_TOUCH_CALIBRATION_TEXT}
- };
+ IDS_SETTINGS_DISPLAY_TOUCH_CALIBRATION_TEXT}};
AddLocalizedStringsBulk(html_source, display_strings,
arraysize(display_strings));
+ html_source->AddBoolean("unifiedDesktopAvailable",
+ base::CommandLine::ForCurrentProcess()->HasSwitch(
+ ::switches::kEnableUnifiedDesktop));
html_source->AddBoolean(
"enableTouchCalibrationSetting",
« no previous file with comments | « chrome/browser/resources/settings/device_page/display.js ('k') | chrome/test/data/webui/settings/device_page_tests.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698