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

views/widget/widget_gtk.h

 // Copyright (c) 2010 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 VIEWS_WIDGET_WIDGET_GTK_H_
 #define VIEWS_WIDGET_WIDGET_GTK_H_
 #pragma once
 
 #include <gtk/gtk.h>
 
-#include "app/active_window_watcher_x.h"
-#include "app/gtk_signal.h"
 #include "base/message_loop.h"
 #include "gfx/size.h"
+#include "ui/base/gtk/gtk_signal.h"
+#include "ui/base/x/active_window_watcher_x.h"
 #include "views/focus/focus_manager.h"
 #include "views/widget/widget.h"
 
 namespace gfx {
 class Rect;
 }
 
 namespace ui {
 class OSExchangeData;
 class OSExchangeDataProviderGtk;
 }
 using ui::OSExchangeData;
 using ui::OSExchangeDataProviderGtk;
 
 namespace views {
 
 class DefaultThemeProvider;
 class DropTargetGtk;
 class FocusSearch;
 class TooltipManagerGtk;
 class View;
 class WindowGtk;
 
 // Widget implementation for GTK.
 class WidgetGtk
     : public Widget,
       public FocusTraversable,
-      public ActiveWindowWatcherX::Observer {
+      public ui::ActiveWindowWatcherX::Observer {
  public:
   // Type of widget.
   enum Type {
     // Used for popup type windows (bubbles, menus ...).
     // NOTE: on X windows of this type can NOT get focus. If you need a popup
     // like widget that can be focused use TYPE_WINDOW and set the window type
     // to WINDOW_TYPE_CHROME_INFO_BUBBLE.
     TYPE_POPUP,
 
     // A top level window with no title or control buttons.
@@ skipping 98 matching lines @@
   void ResetDropTarget();
 
   // Returns the RootView for |widget|.
   static RootView* GetRootViewForWidget(GtkWidget* widget);
 
   // Gets the requested size of the widget.  This can be the size
   // stored in properties for a GtkViewsFixed, or in the requisitioned
   // size of other kinds of widgets.
   void GetRequestedSize(gfx::Size* out) const;
 
-  // Overriden from ActiveWindowWatcherX::Observer.
+  // Overriden from ui::ActiveWindowWatcherX::Observer.
   virtual void ActiveWindowChanged(GdkWindow* active_window);
 
   // Overridden from Widget:
   virtual void Init(gfx::NativeView parent, const gfx::Rect& bounds);
   virtual void InitWithWidget(Widget* parent, const gfx::Rect& bounds);
   virtual WidgetDelegate* GetWidgetDelegate();
   virtual void SetWidgetDelegate(WidgetDelegate* delegate);
   virtual void SetContentsView(View* view);
   virtual void GetBounds(gfx::Rect* out, bool including_frame) const;
   virtual void SetBounds(const gfx::Rect& bounds);
@@ skipping 278 matching lines @@
 
   // Indicates if we should handle the upcoming Alt key release event.
   bool should_handle_menu_key_release_;
 
   DISALLOW_COPY_AND_ASSIGN(WidgetGtk);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_WIDGET_WIDGET_GTK_H_