GTK: Move code shared by future content/ classes and chrome/ to ui/.

chrome/browser/tab_contents/tab_contents_view_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_TAB_CONTENTS_TAB_CONTENTS_VIEW_GTK_H_
 #define CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_GTK_H_
 #pragma once
 
 #include <gtk/gtk.h>
 
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/tab_contents/render_view_host_delegate_helper.h"
-#include "chrome/browser/ui/gtk/focus_store_gtk.h"
 #include "content/browser/tab_contents/tab_contents_view.h"
+#include "ui/base/gtk/focus_store_gtk.h"
 #include "ui/base/gtk/gtk_signal.h"
 #include "ui/base/gtk/owned_widget_gtk.h"
 
 namespace content {
 class WebDragDestDelegate;
 class WebDragDestGtk;
 class WebDragSourceGtk;
 }
 
 class TabContentsViewWrapperGtk;
@@ skipping 100 matching lines @@
   // The TabContents whose contents we display.
   TabContents* tab_contents_;
 
   // Common implementations of some RenderViewHostDelegate::View methods.
   RenderViewHostDelegateViewHelper delegate_view_helper_;
 
   // This container holds the tab's web page views. It is a GtkExpandedContainer
   // so that we can control the size of the web pages.
   ui::OwnedWidgetGtk expanded_;
 
-  FocusStoreGtk focus_store_;
+  ui::FocusStoreGtk focus_store_;
 
   // The helper object that handles drag destination related interactions with
   // GTK.
   scoped_ptr<content::WebDragDestGtk> drag_dest_;
 
   // Object responsible for handling drags from the page for us.
   scoped_ptr<content::WebDragSourceGtk> drag_source_;
 
   // Our optional views wrapper. If non-NULL, we return this widget as our
   // GetNativeView() and insert |expanded_| as its child in the GtkWidget
   // hierarchy.
   scoped_ptr<TabContentsViewWrapperGtk> view_wrapper_;
 
   // The size we want the tab contents view to be.  We keep this in a separate
   // variable because resizing in GTK+ is async.
   gfx::Size requested_size_;
 
   // The overlaid view. Owned by the caller of |InstallOverlayView|; this is a
   // weak reference.
   GtkWidget* overlaid_view_;
 
   DISALLOW_COPY_AND_ASSIGN(TabContentsViewGtk);
 };
 
 #endif  // CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_GTK_H_