Move chrome/browser/gtk to chrome/browser/ui/gtk

chrome/browser/gtk/extension_popup_gtk.h

Index: chrome/browser/gtk/extension_popup_gtk.h
diff --git a/chrome/browser/gtk/extension_popup_gtk.h b/chrome/browser/gtk/extension_popup_gtk.h
index df983de492d5c8707b8b169080afa1963b521b1b..89fe0ad79c1a62d3e8315e132f1236737d2ac94c 100644
--- a/chrome/browser/gtk/extension_popup_gtk.h
+++ b/chrome/browser/gtk/extension_popup_gtk.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -6,95 +6,7 @@
 #define CHROME_BROWSER_GTK_EXTENSION_POPUP_GTK_H_
 #pragma once
 
-#include "base/scoped_ptr.h"
-#include "base/task.h"
-#include "chrome/browser/gtk/extension_view_gtk.h"
-#include "chrome/browser/gtk/info_bubble_gtk.h"
-#include "chrome/common/notification_observer.h"
-#include "chrome/common/notification_registrar.h"
-#include "gfx/rect.h"
-
-class Browser;
-class ExtensionHost;
-class GURL;
-
-class ExtensionPopupGtk : public NotificationObserver,
-                          public InfoBubbleGtkDelegate,
-                          public ExtensionViewGtk::Container {
- public:
-  ExtensionPopupGtk(Browser* browser,
-                    ExtensionHost* host,
-                    GtkWidget* anchor,
-                    bool inspect);
-  virtual ~ExtensionPopupGtk();
-
-  static void Show(const GURL& url,
-                   Browser* browser,
-                   GtkWidget* anchor,
-                   bool inspect);
-
-  // NotificationObserver implementation.
-  virtual void Observe(NotificationType type,
-                       const NotificationSource& source,
-                       const NotificationDetails& details);
-
-  // InfoBubbleGtkDelegate implementation.
-  virtual void InfoBubbleClosing(InfoBubbleGtk* bubble,
-                                 bool closed_by_escape);
-
-  // ExtensionViewGtk::Container implementation
-  virtual void OnExtensionPreferredSizeChanged(ExtensionViewGtk* view,
-                                               const gfx::Size& new_size);
-
-  // Destroys the popup widget. This will in turn destroy us since we delete
-  // ourselves when the info bubble closes. Returns true if we successfully
-  // closed the bubble.
-  bool DestroyPopup();
-
-  // Get the currently showing extension popup, or NULL.
-  static ExtensionPopupGtk* get_current_extension_popup() {
-    return current_extension_popup_;
-  }
-
-  bool being_inspected() const {
-    return being_inspected_;
-  }
-
-  // Declared here for testing.
-  static const int kMinWidth;
-  static const int kMinHeight;
-  static const int kMaxWidth;
-  static const int kMaxHeight;
-
- private:
-  // Shows the popup widget. Called after loading completes.
-  void ShowPopup();
-
-  Browser* browser_;
-
-  InfoBubbleGtk* bubble_;
-
-  // We take ownership of the popup ExtensionHost.
-  scoped_ptr<ExtensionHost> host_;
-
-  // The widget for anchoring the position of the info bubble.
-  GtkWidget* anchor_;
-
-  NotificationRegistrar registrar_;
-
-  static ExtensionPopupGtk* current_extension_popup_;
-
-  // Whether a devtools window is attached to this bubble.
-  bool being_inspected_;
-
-  ScopedRunnableMethodFactory<ExtensionPopupGtk> method_factory_;
-
-  // Used for testing. ---------------------------------------------------------
-  gfx::Rect GetViewBounds();
-
-  friend class BrowserActionTestUtil;
-
-  DISALLOW_COPY_AND_ASSIGN(ExtensionPopupGtk);
-};
+#include "chrome/browser/ui/gtk/extension_popup_gtk.h"
+// TODO(msw): remove this file once all includes have been updated.
 
 #endif  // CHROME_BROWSER_GTK_EXTENSION_POPUP_GTK_H_