Move a bunch of random other files to src/ui/base...

chrome/browser/ui/gtk/browser_window_gtk.h

 // Copyright (c) 2011 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 CHROME_BROWSER_UI_GTK_BROWSER_WINDOW_GTK_H_
 #define CHROME_BROWSER_UI_GTK_BROWSER_WINDOW_GTK_H_
 #pragma once
 
 #include <gtk/gtk.h>
 
 #include <map>
 
-#include "app/active_window_watcher_x.h"
-#include "app/gtk_signal.h"
-#include "app/x11_util.h"
 #include "base/scoped_ptr.h"
 #include "base/timer.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/browser/tabs/tab_strip_model_observer.h"
 #include "chrome/browser/ui/gtk/infobar_arrow_model.h"
 #include "chrome/common/notification_registrar.h"
 #include "gfx/rect.h"
+#include "ui/base/gtk/gtk_signal.h"
+#include "ui/base/x/active_window_watcher_x.h"
+#include "ui/base/x/x11_util.h"
 
 class BookmarkBarGtk;
 class Browser;
 class BrowserTitlebar;
 class BrowserToolbarGtk;
 class CustomDrawButton;
 class DownloadShelfGtk;
 class FindBarGtk;
 class FullscreenExitBubbleGtk;
 class InfoBarContainerGtk;
 class LocationBar;
 class StatusBubbleGtk;
 class TabContentsContainerGtk;
 class TabStripGtk;
 
 // An implementation of BrowserWindow for GTK.
 // Cross-platform code will interact with this object when
 // it needs to manipulate the window.
 
 class BrowserWindowGtk : public BrowserWindow,
                          public NotificationObserver,
                          public TabStripModelObserver,
-                         public ActiveWindowWatcherX::Observer,
+                         public ui::ActiveWindowWatcherX::Observer,
                          public InfoBarArrowModel::Observer {
  public:
   explicit BrowserWindowGtk(Browser* browser);
   virtual ~BrowserWindowGtk();
 
   // Overridden from BrowserWindow
   virtual void Show();
   virtual void SetBounds(const gfx::Rect& bounds);
   virtual void Close();
   virtual void Activate();
@@ skipping 429 matching lines @@
   scoped_ptr<FullscreenExitBubbleGtk> fullscreen_exit_bubble_;
 
   // The model that tracks the paint state of the arrow for the infobar
   // directly below the toolbar.
   InfoBarArrowModel infobar_arrow_model_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserWindowGtk);
 };
 
 #endif  // CHROME_BROWSER_UI_GTK_BROWSER_WINDOW_GTK_H_