[Merge to M58] cros: Treat set rotation for chrome.system.display API in touchview mode as if user …

chrome/browser/extensions/display_info_provider_chromeos.cc

 // Copyright 2014 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/extensions/display_info_provider_chromeos.h"
 
 #include <stdint.h>
 
+#include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/display/display_configuration_controller.h"
 #include "ash/display/resolution_notification_controller.h"
+#include "ash/display/screen_orientation_controller_chromeos.h"
 #include "ash/shell.h"
 #include "ash/touch/ash_touch_transform_controller.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/chromeos/display/display_preferences.h"
 #include "chrome/browser/chromeos/display/overscan_calibrator.h"
 #include "chrome/browser/chromeos/display/touch_calibrator/touch_calibrator_controller.h"
 #include "chrome/browser/ui/ash/ash_util.h"
 #include "extensions/common/api/system_display.h"
 #include "ui/display/display.h"
 #include "ui/display/display_layout.h"
@@ skipping 380 matching lines @@
   }
 
   if (display.touch_support() != display::Display::TOUCH_SUPPORT_AVAILABLE) {
     *error = "Display Id(" + id + ") does not support touch.";
     return false;
   }
 
   return true;
 }
 
+bool IsMaximizeModeWindowManagerEnabled() {
+  return ash::Shell::GetInstance()
+      ->maximize_mode_controller()
+      ->IsMaximizeModeWindowManagerEnabled();
+}
+
 }  // namespace
 
 // static
 const char DisplayInfoProviderChromeOS::
     kCustomTouchCalibrationInProgressError[] =
         "Another custom touch calibration already under progress.";
 
 // static
 const char DisplayInfoProviderChromeOS::
     kCompleteCalibrationCalledBeforeStartError[] =
@@ skipping 66 matching lines @@
 
   // Process 'overscan' parameter.
   if (info.overscan) {
     display_manager->SetOverscanInsets(
         display_id, gfx::Insets(info.overscan->top, info.overscan->left,
                                 info.overscan->bottom, info.overscan->right));
   }
 
   // Process 'rotation' parameter.
   if (info.rotation) {
-    display_configuration_controller->SetDisplayRotation(
-        display_id, DegreesToRotation(*info.rotation),
-        display::Display::ROTATION_SOURCE_ACTIVE);
+    if (IsMaximizeModeWindowManagerEnabled() &&
+        display_id == display::Display::InternalDisplayId()) {
+      ash::Shell::GetInstance()
+          ->screen_orientation_controller()
+          ->SetLockToRotation(DegreesToRotation(*info.rotation));
+    } else {
+      display_configuration_controller->SetDisplayRotation(
+          display_id, DegreesToRotation(*info.rotation),
+          display::Display::ROTATION_SOURCE_ACTIVE);
+    }
   }
 
   // Process new display origin parameters.
   gfx::Point new_bounds_origin = target.bounds().origin();
   if (info.bounds_origin_x)
     new_bounds_origin.set_x(*info.bounds_origin_x);
   if (info.bounds_origin_y)
     new_bounds_origin.set_y(*info.bounds_origin_y);
 
   if (new_bounds_origin != target.bounds().origin()) {
@@ skipping 374 matching lines @@
     touch_calibrator_.reset(new chromeos::TouchCalibratorController);
   return touch_calibrator_.get();
 }
 
 // static
 DisplayInfoProvider* DisplayInfoProvider::Create() {
   return new DisplayInfoProviderChromeOS();
 }
 
 }  // namespace extensions