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

chrome/browser/gtk/options/content_settings_window_gtk.h

Index: chrome/browser/gtk/options/content_settings_window_gtk.h
diff --git a/chrome/browser/gtk/options/content_settings_window_gtk.h b/chrome/browser/gtk/options/content_settings_window_gtk.h
index 6e32f4a41e16923e6ce7954ab072447ae8ce5385..509ea0c7862dc6119854069f535379abfc1dfaf7 100644
--- a/chrome/browser/gtk/options/content_settings_window_gtk.h
+++ b/chrome/browser/gtk/options/content_settings_window_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,68 +6,7 @@
 #define CHROME_BROWSER_GTK_OPTIONS_CONTENT_SETTINGS_WINDOW_GTK_H_
 #pragma once
 
-#include <gtk/gtk.h>
-
-#include "app/gtk_signal.h"
-#include "base/scoped_ptr.h"
-#include "chrome/browser/gtk/options/cookie_filter_page_gtk.h"
-#include "chrome/browser/gtk/options/content_filter_page_gtk.h"
-#include "chrome/browser/prefs/pref_member.h"
-#include "chrome/common/content_settings_types.h"
-
-class AccessibleWidgetHelper;
-
-// A window that presents options to the user for blocking various kinds of
-// content in webpages (cookies, javascript, images, popups).
-class ContentSettingsWindowGtk {
- public:
-  // Shows the current content settings page, opening a new one if it doesn't
-  // exist.
-  static void Show(GtkWindow* parent, ContentSettingsType page,
-                   Profile* profile);
-  static void RegisterUserPrefs(PrefService* prefs);
-
-  explicit ContentSettingsWindowGtk(GtkWindow* parent, Profile* profile);
-  virtual ~ContentSettingsWindowGtk();
-
- private:
-  // Shows the Tab corresponding to the specified Content Settings page.
-  void ShowContentSettingsTab(ContentSettingsType page);
-
-  CHROMEGTK_CALLBACK_2(ContentSettingsWindowGtk, void, OnSwitchPage,
-                       GtkNotebookPage*, guint);
-  CHROMEGTK_CALLBACK_0(ContentSettingsWindowGtk, void, OnWindowDestroy);
-  CHROMEG_CALLBACK_0(ContentSettingsWindowGtk, void, OnListSelectionChanged,
-                     GtkTreeSelection*);
-
-  // The options dialog.
-  GtkWidget* dialog_;
-
-  // The container of the option pages.
-  GtkWidget* notebook_;
-  GtkWidget* list_;
-
-  // The Profile associated with these options.
-  Profile* profile_;
-
-  // The last page the user was on when they opened the ContentSettings window.
-  IntegerPrefMember last_selected_page_;
-
-  // The individual page implementations. Note that we have a specialized one
-  // for cookies (which have more complex rules) and use the same basic page
-  // layout for each other type.
-  CookieFilterPageGtk cookie_page_;
-  ContentFilterPageGtk image_page_;
-  ContentFilterPageGtk javascript_page_;
-  ContentFilterPageGtk plugin_page_;
-  ContentFilterPageGtk popup_page_;
-  ContentFilterPageGtk geolocation_page_;
-  ContentFilterPageGtk notifications_page_;
-
-  // Helper object to manage accessibility metadata.
-  scoped_ptr<AccessibleWidgetHelper> accessible_widget_helper_;
-
-  DISALLOW_COPY_AND_ASSIGN(ContentSettingsWindowGtk);
-};
+#include "chrome/browser/ui/gtk/options/content_settings_window_gtk.h"
+// TODO(msw): remove this file once all includes have been updated.
 
 #endif  // CHROME_BROWSER_GTK_OPTIONS_CONTENT_SETTINGS_WINDOW_GTK_H_