Move the desktop aura classes into a desktop subdir to make the gyp simpler.

chrome/browser/ui/aura/tabs/dock_info_aurax11.cc

 // 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.
 
 #include "chrome/browser/ui/tabs/dock_info.h"
 
 #include "chrome/browser/ui/host_desktop.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/base/x/x11_util.h"
-#include "ui/views/widget/desktop_root_window_host_linux.h"
 
-#if !defined(USE_ASH)
+#if !defined(OS_CHROMEOS)
+#include "ui/views/widget/desktop_aura/desktop_root_window_host_linux.h"
+#endif
+
+#if !defined(OS_CHROMEOS)
 
 namespace {
 
 ////////////////////////////////////////////////////////////////////////////////
 // BaseWindowFinder
 //
 // Base class used to locate a window. A subclass need only override
 // ShouldStopIterating to determine when iteration should stop.
 class BaseWindowFinder : public ui::EnumerateWindowsDelegate {
  public:
@@ skipping 174 matching lines @@
     return false;
   *bounds = window_->bounds();
   return true;
 }
 
 void DockInfo::SizeOtherWindowTo(const gfx::Rect& bounds) const {
   window_->SetBounds(bounds);
 }
 
 #endif