OOBE: Remove AdaptiveOobe flag

It can't be disabled/enabled remotely on the welcome screen - so kinda
useless to guard the feature.

Bug: 999090
Change-Id: I7489355c7a9925edef69d47de05d4fe22ae6c45a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1824878Reviewed-by: Denis Kuznetsov <antrim@chromium.org>
Commit-Queue: Roman Sorokin [CET] <rsorokin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#700436}

chrome/browser/resources/chromeos/login/md_screen_container.css

@@ -4,11 +4,6 @@
  */
 
 :root {
-  --oobe-dialog-host-height: 640px;
-  --oobe-dialog-host-width: 768px;
-}
-
-html[adaptive-oobe] {
   --oobe-dialog-host-height: 100%;
   --oobe-dialog-host-width: 100%;
 }
@@ -116,13 +111,7 @@ html:not([full-screen-dialog]) #oobe.tpm-error-message #inner-container {
   transform: translateY(50px) rotateX(-2.5deg);
 }
 
-html:not([adaptive-oobe]) body:not(.oobe-display) #inner-container {
-  height: 262px;
-  padding: 0;
-  width: 1100px;
-}
-
-html[adaptive-oobe] #oobe {
+#oobe {
   box-sizing: border-box;
   height: 100%;
   max-height: 864px; /* 768 + 48*2 */
@@ -136,9 +125,8 @@ html[adaptive-oobe] #oobe {
 
 #outer-container.fullscreen,
 #outer-container.fullscreen #oobe,
-html:not([adaptive-oobe]) #outer-container.fullscreen #oobe #inner-container,
-html[adaptive-oobe] #inner-container,
-html[adaptive-oobe] #inner-container > .step {
+#inner-container,
+#inner-container > .step {
   height: 100%;
   width: 100%;
 }

chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc

@@ -185,7 +185,6 @@ void CoreOobeHandler::GetAdditionalParameters(base::DictionaryValue* dict) {
                base::Value(DemoSetupController::IsDemoModeAllowed()));
   dict->SetKey("showTechnologyBadge",
                base::Value(!ash::features::IsSeparateNetworkIconsEnabled()));
-  dict->SetKey("adaptiveOobe", base::Value(features::IsAdaptiveOobeEnabled()));
 }
 
 void CoreOobeHandler::RegisterMessages() {

chromeos/constants/chromeos_features.cc

@@ -21,10 +21,6 @@ const base::Feature kInstantTetheringBackgroundAdvertisementSupport{
 const base::Feature kAccountManager{"ChromeOSAccountManager",
                                     base::FEATURE_ENABLED_BY_DEFAULT};
 
-// Enables or disables adaptive OOBE UX.
-const base::Feature kAdaptiveOobe{"AdaptiveOobe",
-                                  base::FEATURE_DISABLED_BY_DEFAULT};
-
 // Controls whether to enable Ambient mode feature.
 const base::Feature kAmbientModeFeature{"ChromeOSAmbientMode",
                                         base::FEATURE_DISABLED_BY_DEFAULT};
@@ -226,10 +222,6 @@ bool IsAccountManagerEnabled() {
   return base::FeatureList::IsEnabled(kAccountManager);
 }
 
-bool IsAdaptiveOobeEnabled() {
-  return base::FeatureList::IsEnabled(kAdaptiveOobe);
-}
-
 bool IsAmbientModeEnabled() {
   return base::FeatureList::IsEnabled(kAmbientModeFeature);
 }

chromeos/constants/chromeos_features.h

@@ -17,8 +17,6 @@ namespace features {
 
 COMPONENT_EXPORT(CHROMEOS_CONSTANTS) extern const base::Feature kAccountManager;
 COMPONENT_EXPORT(CHROMEOS_CONSTANTS)
-extern const base::Feature kAdaptiveOOBE;
-COMPONENT_EXPORT(CHROMEOS_CONSTANTS)
 extern const base::Feature kAmbientModeFeature;
 COMPONENT_EXPORT(CHROMEOS_CONSTANTS)
 extern const base::Feature kAutoScreenBrightness;
@@ -105,7 +103,6 @@ extern const base::Feature kVideoPlayerNativeControls;
 // Keep alphabetized.
 
 COMPONENT_EXPORT(CHROMEOS_CONSTANTS) bool IsAccountManagerEnabled();
-COMPONENT_EXPORT(CHROMEOS_CONSTANTS) bool IsAdaptiveOobeEnabled();
 COMPONENT_EXPORT(CHROMEOS_CONSTANTS) bool IsAmbientModeEnabled();
 COMPONENT_EXPORT(CHROMEOS_CONSTANTS) bool IsAssistantEnabled();
 COMPONENT_EXPORT(CHROMEOS_CONSTANTS) bool IsImeDecoderWithSandboxEnabled();

ui/login/display_manager.js

@@ -287,11 +287,6 @@ cr.define('cr.ui.login', function() {
       return !!userCount;
     },
 
-    get isAdaptiveOobe() {
-      return loadTimeData.valueExists('adaptiveOobe') &&
-          loadTimeData.getBoolean('adaptiveOobe');
-    },
-
     /**
      * Sets the current size of the client area (display size).
      * @param {number} width client area width
@@ -752,36 +747,13 @@ cr.define('cr.ui.login', function() {
      * @param {!HTMLElement} screen Screen that is being shown.
      */
     updateScreenSize: function(screen) {
-      if (!this.isAdaptiveOobe) {
-        // Have to reset any previously predefined screen size first
-        // so that screen contents would define it instead.
-        $('inner-container').style.height = '';
-        $('inner-container').style.width = '';
-        screen.style.width = '';
-        screen.style.height = '';
-      }
-
       $('outer-container').classList.toggle(
         'fullscreen', screen.classList.contains('fullscreen'));
 
-      var width = screen.getPreferredSize().width;
-      var height = screen.getPreferredSize().height;
-
-      if (!this.isAdaptiveOobe) {
-        if (screen.classList.contains('fullscreen')) {
-          $('inner-container').style.height = '100%';
-          $('inner-container').style.width = '100%';
-        } else {
-          $('inner-container').style.height = height + 'px';
-          $('inner-container').style.width = width + 'px';
-        }
-        // This requires |screen| to have 'box-sizing: border-box'.
-        screen.style.width = width + 'px';
-        screen.style.height = height + 'px';
-        screen.style.margin = 'auto';
-      }
 
       if (this.showingViewsLogin) {
+        var width = screen.getPreferredSize().width;
+        var height = screen.getPreferredSize().height;
         chrome.send('updateOobeDialogSize', [width, height]);
         $('scroll-container').classList.toggle('disable-scroll', true);
         $('inner-container').classList.toggle('disable-scroll', true);
@@ -1034,8 +1006,6 @@ cr.define('cr.ui.login', function() {
     instance.initializeDemoModeMultiTapListener();
 
     window.addEventListener('resize', instance.onWindowResize_.bind(instance));
-    if (instance.isAdaptiveOobe)
-      document.documentElement.setAttribute('adaptive-oobe', '');
   };
 
   /**