Add DisplayLayoutManagerMulti (WIP)

chrome/browser/resources/options/chromeos/display_options.js

 // Copyright (c) 2012 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.
 
 cr.exportPath('options');
 
 /**
  * Enumeration of multi display mode. These values must match the C++ values in
  * ash::DisplayManager.
  * @enum {number}
@@ skipping 352 matching lines @@
       var secondaryId;
       for (var i = 0; i < this.displays_.length; i++) {
         if (!this.displays_[i].isPrimary) {
           secondaryId = this.displays_[i].id;
           break;
         }
       }
       assert(!!secondaryId);
       var displayLayout =
           this.displayLayoutManager_.getDisplayLayout(secondaryId);
+      console.log(
+          'setDisplayLayout: ' + displayLayout.layoutType + ' : ' +
+          displayLayout.offset);
       chrome.send(
           'setDisplayLayout',
           [secondaryId, displayLayout.layoutType, displayLayout.offset]);
+      // TODO(stevenjb): Remove once we send all layout changes.
+      chrome.send('getDisplayInfo');
     },
 
     /**
      * Processes the actual dragging of display rectangle.
      * @param {Event} e The event which triggers this drag.
      * @param {options.DisplayPosition} eventLocation The location where the
      *     event happens.
      * @private
      */
     processDragging_: function(e, eventLocation) {
@@ skipping 267 matching lines @@
         div.style.height = height + 'px';
         div.style.zIndex = i;
         // set 'display-mirrored' class for the background display rectangles.
         if (i != numDisplays - 1)
           div.classList.add('display-mirrored');
         this.displaysView_.appendChild(div);
       }
     },
 
     /**
-     * Creates a DisplayLayout object representing the display.
-     * @param {!options.DisplayInfo} display
-     * @param {!options.DisplayLayoutType} layoutType
-     * @param {string} parentId
-     * @return {!options.DisplayLayout}
-     * @private
-     */
-    createDisplayLayout_: function(display, layoutType, parentId) {
-      return {
-        bounds: display.bounds,
-        div: null,
-        id: display.id,
-        layoutType: layoutType,
-        name: display.name,
-        offset: 0,
-        originalPosition: {x: 0, y: 0},
-        parentId: parentId
-      };
-    },
-
-    /**
      * Layouts the display rectangles according to the current layout_.
      * @param {options.DisplayLayoutType} layoutType
      * @private
      */
     layoutDisplays_: function(layoutType) {
       // Create the layout manager.
-      this.displayLayoutManager_ = new options.DisplayLayoutManager();
+      this.displayLayoutManager_ = new options.DisplayLayoutManagerMulti();
 
       // Create the display layouts. Child displays are parented to the primary.
       // TODO(stevenjb): DisplayInfo should provide the parent id for displays.
       var primaryDisplayId = '';
       for (var i = 0; i < this.displays_.length; i++) {
         var display = this.displays_[i];
         if (display.isPrimary) {
           primaryDisplayId = display.id;
           break;
         }
       }
       for (var i = 0; i < this.displays_.length; i++) {
         var display = this.displays_[i];
         var parentId = display.isPrimary ? '' : primaryDisplayId;
-        var layout = this.createDisplayLayout_(display, layoutType, parentId);
+        var layout = this.displayLayoutManager_.createDisplayLayout(
+            display.id, display.name, display.bounds, layoutType, parentId);
         this.displayLayoutManager_.addDisplayLayout(layout);
       }
 
       // Calculate the display area bounds and create the divs for each display.
       this.visualScale_ = this.displayLayoutManager_.createDisplayArea(
           /** @type {!Element} */(this.displaysView_), VISUAL_SCALE);
 
       this.displayLayoutManager_.setFocusedId(this.focusedId_);
       this.displayLayoutManager_.setDivCallbacks(
           this.onMouseDown_.bind(this), this.onTouchStart_.bind(this));
@@ skipping 61 matching lines @@
       mode, displays, layoutType, offset) {
     DisplayOptions.getInstance().onDisplayChanged_(
         mode, displays, layoutType, offset);
   };
 
   // Export
   return {
     DisplayOptions: DisplayOptions
   };
 });