Unified Desktop: hook up ash to allow unified desktop mode

ash/touch/touch_transformer_controller.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 "ash/touch/touch_transformer_controller.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/display/display_manager.h"
 #include "ash/host/ash_window_tree_host.h"
 #include "ash/root_window_controller.h"
@@ skipping 124 matching lines @@
   DisplayInfo display2;
   // Display ID and DisplayInfo for single display mode.
   int64 single_display_id = gfx::Display::kInvalidDisplayID;
   DisplayInfo single_display;
 
   DisplayController* display_controller =
       Shell::GetInstance()->display_controller();
   DisplayManager* display_manager = GetDisplayManager();
   if (display_manager->num_connected_displays() == 0) {
     return;
-  } else if (display_manager->num_connected_displays() == 1) {
+  } else if (display_manager->num_connected_displays() == 1 ||
+             display_manager->multi_display_mode() == DisplayManager::UNIFIED) {
     single_display_id = display_manager->first_display_id();
     DCHECK(single_display_id != gfx::Display::kInvalidDisplayID);
     single_display = display_manager->GetDisplayInfo(single_display_id);
     device_manager->UpdateTouchRadiusScale(
         single_display.touch_device_id(),
         GetTouchResolutionScale(
             single_display,
             FindTouchscreenById(single_display.touch_device_id())));
   } else {
     DisplayIdPair id_pair = display_manager->GetCurrentDisplayIdPair();
@@ skipping 80 matching lines @@
 
 void TouchTransformerController::OnDisplaysInitialized() {
   UpdateTouchTransformer();
 }
 
 void TouchTransformerController::OnDisplayConfigurationChanged() {
   UpdateTouchTransformer();
 }
 
 }  // namespace ash