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

Unified Diff: chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc

Issue 12617019: Add display scaling and rotation shortcuts to keyboard overlay. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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/chromeos/keyboard_overlay_data.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/chromeos/keyboard_overlay_ui.cc
diff --git a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc
index db81f9f8a873ab5711afec5f67e498e6db64ef6a..9f77f0762be42833ccca8ca3de4b65b2fc698897 100644
--- a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc
@@ -4,6 +4,8 @@
#include "chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.h"
+#include "ash/display/display_manager.h"
+#include "ash/shell.h"
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/command_line.h"
@@ -192,7 +194,10 @@ struct I18nContentToMessage {
IDS_KEYBOARD_OVERLAY_REOPEN_LAST_CLOSED_TAB },
{ "keyboardOverlayReportIssue", IDS_KEYBOARD_OVERLAY_REPORT_ISSUE },
{ "keyboardOverlayResetZoom", IDS_KEYBOARD_OVERLAY_RESET_ZOOM },
+ { "keyboardOverlayRotateScreen", IDS_KEYBOARD_OVERLAY_ROTATE_SCREEN },
{ "keyboardOverlaySave", IDS_KEYBOARD_OVERLAY_SAVE },
+ { "keyboardOverlayScaleDownUi", IDS_KEYBOARD_OVERLAY_SCALE_DOWN_UI },
+ { "keyboardOverlayScaleUpUi", IDS_KEYBOARD_OVERLAY_SCALE_UP_UI },
{ "keyboardOverlayScreenshotRegion",
IDS_KEYBOARD_OVERLAY_SCREENSHOT_REGION },
{ "keyboardOverlayScrollUpOnePage",
@@ -251,6 +256,16 @@ content::WebUIDataSource* CreateKeyboardOverlayUIHTMLSource() {
switches::kHasChromeOSDiamondKey) ? "true" : "false";
source->AddString("keyboardOverlayHasChromeOSDiamondKey",
has_diamond_key_value);
+ ash::Shell* shell = ash::Shell::GetInstance();
+ if (shell) {
+ ash::internal::DisplayManager* display_manager = shell->display_manager();
+ source->AddString("keyboardOverlayIsDisplayRotationEnabled",
+ display_manager->IsDisplayRotationEnabled() ?
+ "true" : "false");
xiyuan 2013/03/23 05:49:09 nit: you could use source->AddBoolean and test tha
mazda 2013/03/23 06:28:45 Cool! Thanks.
+ source->AddString("keyboardOverlayIsDisplayUIScalingEnabled",
+ display_manager->IsDisplayUIScalingEnabled() ?
+ "true" : "false");
+ }
source->SetJsonPath("strings.js");
source->SetUseJsonJSFormatV2();
source->AddResourcePath("keyboard_overlay.js", IDR_KEYBOARD_OVERLAY_JS);
« no previous file with comments | « chrome/browser/resources/chromeos/keyboard_overlay_data.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698