Remove obsolete switches --ash-disable-ui-scaling, --ash-disable-display-rotation

BUG=273142
R=derat@chromium.org, mazda@chromium.org, xiyuan@chromium.org

Review URL: https://codereview.chromium.org/22957004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217826 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 1 insertions, 36 deletions

diff --git a/ash/ash_switches.cc b/ash/ash_switches.cc
index c328b59..acb106f 100644
--- a/ash/ash_switches.cc
+++ b/ash/ash_switches.cc
@@ -69,16 +69,10 @@ const char kAshDisableNewLockAnimations[] = "ash-disable-new-lock-animations";
 // Disable the per application grouping version of the launcher.
 const char kAshDisablePerAppLauncher[] = "ash-disable-per-app-launcher";
 
-// Disables display rotation.
-const char kAshDisableDisplayRotation[] = "ash-disable-display-rotation";
-
 // Disable immersive fullscreen mode, regardless of default setting.
 const char kAshDisableImmersiveFullscreen[] =
     "ash-disable-immersive-fullscreen";
 
-// Disables ui scaling.
-const char kAshDisableUIScaling[] = "ash-disable-ui-scaling";
-
 #if defined(OS_CHROMEOS)
 // Disable compositor based mirroring.
 const char kAshDisableSoftwareMirroring[] = "ash-disable-software-mirroring";
diff --git a/ash/ash_switches.h b/ash/ash_switches.h
index df615b8..5fe137c 100644
--- a/ash/ash_switches.h
+++ b/ash/ash_switches.h
@@ -35,8 +35,6 @@ ASH_EXPORT extern const char kAshDisableDisplayChangeLimiter[];
 ASH_EXPORT extern const char kAshDisableImmersiveFullscreen[];
 ASH_EXPORT extern const char kAshDisableNewLockAnimations[];
 ASH_EXPORT extern const char kAshDisablePerAppLauncher[];
-ASH_EXPORT extern const char kAshDisableUIScaling[];
-ASH_EXPORT extern const char kAshDisableDisplayRotation[];
 ASH_EXPORT extern const char kAshDisableDragAndDropAppListToLauncher[];
 #if defined(OS_CHROMEOS)
 ASH_EXPORT extern const char kAshDisableSoftwareMirroring[];
diff --git a/ash/display/display_manager.cc b/ash/display/display_manager.cc
index 8953fc8..1c3edea 100644
--- a/ash/display/display_manager.cc
+++ b/ash/display/display_manager.cc
@@ -321,8 +321,6 @@ void DisplayManager::SetOverscanInsets(int64 display_id,
 
 void DisplayManager::SetDisplayRotation(int64 display_id,
                                         gfx::Display::Rotation rotation) {
-  if (!IsDisplayRotationEnabled())
-    return;
   DisplayInfoList display_info_list;
   for (DisplayList::const_iterator iter = displays_.begin();
        iter != displays_.end(); ++iter) {
@@ -426,17 +424,7 @@ bool DisplayManager::GetSelectedResolutionForDisplayId(
   return true;
 }
 
-bool DisplayManager::IsDisplayRotationEnabled() const {
-  static bool enabled = !CommandLine::ForCurrentProcess()->
-      HasSwitch(switches::kAshDisableDisplayRotation);
-  return enabled;
-}
-
 bool DisplayManager::IsDisplayUIScalingEnabled() const {
-  static bool enabled = !CommandLine::ForCurrentProcess()->
-      HasSwitch(switches::kAshDisableUIScaling);
-  if (!enabled)
-    return false;
   return GetDisplayIdForUIScaling() != gfx::Display::kInvalidDisplayID;
 }
 
diff --git a/ash/display/display_manager.h b/ash/display/display_manager.h
index f7554a7..b2ef8d1 100644
--- a/ash/display/display_manager.h
+++ b/ash/display/display_manager.h
@@ -151,8 +151,7 @@ class ASH_EXPORT DisplayManager
   bool GetSelectedResolutionForDisplayId(int64 display_id,
                                          gfx::Size* resolution_out) const;
 
-  // Tells if display rotation/ui scaling features are enabled.
-  bool IsDisplayRotationEnabled() const;
+  // Tells if the virtual resolution feature is enabled.
   bool IsDisplayUIScalingEnabled() const;
 
   // Returns the current overscan insets for the specified |display_id|.
diff --git a/chrome/browser/resources/chromeos/keyboard_overlay.js b/chrome/browser/resources/chromeos/keyboard_overlay.js
index d28515f..06d07d2 100644
--- a/chrome/browser/resources/chromeos/keyboard_overlay.js
+++ b/chrome/browser/resources/chromeos/keyboard_overlay.js
@@ -128,10 +128,6 @@ function getShortcutData() {
 
   shortcutDataCache = keyboardOverlayData['shortcut'];
 
-  if (!isDisplayRotationEnabled()) {
-    // Rotate screen
-    delete shortcutDataCache['reload<>CTRL<>SHIFT'];
-  }
   if (!isDisplayUIScalingEnabled()) {
     // Zoom screen in
     delete shortcutDataCache['+<>CTRL<>SHIFT'];
@@ -575,14 +571,6 @@ function hasDiamondKey() {
 }
 
 /**
- * Returns true if display rotation feature is enabled.
- * @return {boolean} True if display rotation feature is enabled.
- */
-function isDisplayRotationEnabled() {
-  return loadTimeData.getBoolean('keyboardOverlayIsDisplayRotationEnabled');
-}
-
-/**
  * Returns true if display scaling feature is enabled.
  * @return {boolean} True if display scaling feature is enabled.
  */
diff --git a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc
index 3854377..96a7f41 100644
--- a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc
@@ -259,8 +259,6 @@ content::WebUIDataSource* CreateKeyboardOverlayUIHTMLSource() {
                          chromeos::switches::kHasChromeOSDiamondKey));
   ash::Shell* shell = ash::Shell::GetInstance();
   ash::internal::DisplayManager* display_manager = shell->display_manager();
-  source->AddBoolean("keyboardOverlayIsDisplayRotationEnabled",
-                     display_manager->IsDisplayRotationEnabled());
   source->AddBoolean("keyboardOverlayIsDisplayUIScalingEnabled",
                      display_manager->IsDisplayUIScalingEnabled());
   source->SetJsonPath("strings.js");