Revert of chromeos: adds TouchDeviceServer and wires up in mushrome

ash/shell.h

 // 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.
 
 #ifndef ASH_SHELL_H_
 #define ASH_SHELL_H_
 
 #include <memory>
 #include <utility>
 #include <vector>
@@ skipping 251 matching lines @@
   static aura::WindowManagerClient* window_manager_client() {
     return window_manager_client_;
   }
 
   static Config GetAshConfig();
   static bool ShouldUseIMEService();
 
   // Registers all ash related prefs to the given |registry|.
   static void RegisterPrefs(PrefRegistrySimple* registry);
 
-  // Returns true if simplified display management should be enabled.
-  // TODO(sky): remove this; temporary until http://crbug.com/718860 is done.
-  static bool ShouldEnableSimplifiedDisplayManagement();
-
   // Creates a default views::NonClientFrameView for use by windows in the
   // Ash environment.
   views::NonClientFrameView* CreateDefaultNonClientFrameView(
       views::Widget* widget);
 
   // Sets work area insets of the display containing |window|, pings observers.
   void SetDisplayWorkAreaInsets(aura::Window* window,
                                 const gfx::Insets& insets);
 
   // Called when a casting session is started or stopped.
@@ skipping 551 matching lines @@
   base::ObserverList<ShellObserver> shell_observers_;
 
   scoped_refptr<base::SequencedWorkerPool> blocking_pool_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_