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

chrome/browser/gtk/content_setting_bubble_gtk.h

Index: chrome/browser/gtk/content_setting_bubble_gtk.h
diff --git a/chrome/browser/gtk/content_setting_bubble_gtk.h b/chrome/browser/gtk/content_setting_bubble_gtk.h
index f003ab69f3076b8a6a1f68356be4a71e5973bb81..d020c664651dfbe4e0f658943b53b4fca99d0360 100644
--- a/chrome/browser/gtk/content_setting_bubble_gtk.h
+++ b/chrome/browser/gtk/content_setting_bubble_gtk.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 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,87 +6,7 @@
 #define CHROME_BROWSER_GTK_CONTENT_SETTING_BUBBLE_GTK_H_
 #pragma once
 
-#include <map>
-
-#include "app/gtk_signal.h"
-#include "base/scoped_ptr.h"
-#include "chrome/browser/gtk/info_bubble_gtk.h"
-#include "chrome/common/content_settings_types.h"
-#include "chrome/common/notification_observer.h"
-#include "chrome/common/notification_registrar.h"
-
-class ContentSettingBubbleModel;
-class Profile;
-class TabContents;
-
-// ContentSettingBubbleGtk is used when the user turns on different kinds of
-// content blocking (e.g. "block images"). An icon appears in the location bar,
-// and when clicked, an instance of this class is created specialized for the
-// type of content being blocked.
-class ContentSettingBubbleGtk : public InfoBubbleGtkDelegate,
-                                public NotificationObserver {
- public:
-   ContentSettingBubbleGtk(
-       GtkWidget* anchor,
-       InfoBubbleGtkDelegate* delegate,
-       ContentSettingBubbleModel* content_setting_bubble_model,
-       Profile* profile, TabContents* tab_contents);
-  virtual ~ContentSettingBubbleGtk();
-
-  // Dismisses the infobubble.
-  void Close();
-
- private:
-  typedef std::map<GtkWidget*, int> PopupMap;
-
-  // InfoBubbleGtkDelegate:
-  virtual void InfoBubbleClosing(InfoBubbleGtk* info_bubble,
-                                 bool closed_by_escape);
-
-  // NotificationObserver:
-  virtual void Observe(NotificationType type,
-                       const NotificationSource& source,
-                       const NotificationDetails& details);
-
-  // Builds the info bubble and all the widgets that it displays.
-  void BuildBubble();
-
-  // Widget callback methods.
-  CHROMEGTK_CALLBACK_1(ContentSettingBubbleGtk, void, OnPopupIconButtonPress,
-                       GdkEventButton*);
-  CHROMEGTK_CALLBACK_0(ContentSettingBubbleGtk, void, OnPopupLinkClicked);
-  CHROMEGTK_CALLBACK_0(ContentSettingBubbleGtk, void, OnRadioToggled);
-  CHROMEGTK_CALLBACK_0(ContentSettingBubbleGtk, void, OnCustomLinkClicked);
-  CHROMEGTK_CALLBACK_0(ContentSettingBubbleGtk, void, OnManageLinkClicked);
-  CHROMEGTK_CALLBACK_0(ContentSettingBubbleGtk, void, OnCloseButtonClicked);
-
-  // We position the bubble near this widget.
-  GtkWidget* anchor_;
-
-  // The active profile.
-  Profile* profile_;
-
-  // The active tab contents.
-  TabContents* tab_contents_;
-
-  // A registrar for listening for TAB_CONTENTS_DESTROYED notifications.
-  NotificationRegistrar registrar_;
-
-  // Pass on delegate messages to this.
-  InfoBubbleGtkDelegate* delegate_;
-
-  // Provides data for this bubble.
-  scoped_ptr<ContentSettingBubbleModel> content_setting_bubble_model_;
-
-  // The info bubble.
-  InfoBubbleGtk* info_bubble_;
-
-  // Stored controls so we can figure out what was clicked.
-  PopupMap popup_links_;
-  PopupMap popup_icons_;
-
-  typedef std::vector<GtkWidget*> RadioGroupGtk;
-  RadioGroupGtk radio_group_gtk_;
-};
+#include "chrome/browser/ui/gtk/content_setting_bubble_gtk.h"
+// TODO(msw): remove this file once all includes have been updated.
 
 #endif  // CHROME_BROWSER_GTK_CONTENT_SETTING_BUBBLE_GTK_H_