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

chrome/browser/gtk/gconf_titlebar_listener.h

Index: chrome/browser/gtk/gconf_titlebar_listener.h
diff --git a/chrome/browser/gtk/gconf_titlebar_listener.h b/chrome/browser/gtk/gconf_titlebar_listener.h
index b96b7593c034f70386576c416c28236364a355a4..87a2e3f734f3b713c6f39f712b1951def1d2e53b 100644
--- a/chrome/browser/gtk/gconf_titlebar_listener.h
+++ b/chrome/browser/gtk/gconf_titlebar_listener.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,67 +6,7 @@
 #define CHROME_BROWSER_GTK_GCONF_TITLEBAR_LISTENER_H_
 #pragma once
 
-#include <gconf/gconf-client.h>
-#include <gtk/gtk.h>
-
-#include <set>
-#include <string>
-
-#include "app/gtk_signal.h"
-#include "base/basictypes.h"
-
-class BrowserTitlebar;
-template <typename T> struct DefaultSingletonTraits;
-
-// On GNOME desktops, subscribes to the gconf key which controlls button order.
-// Everywhere else, SetTiltebarButtons() just calls back into BrowserTitlebar
-// with the default ordering.
-//
-// Meant to be used as a Singleton through base/singleton.h's interface.
-class GConfTitlebarListener {
- public:
-  // Returns the singleton instance.
-  static GConfTitlebarListener* GetInstance();
-
-  // Sets the current titlebar button order. On GNOME desktops, also subscribes
-  // to further notifications when this changes.
-  void SetTitlebarButtons(BrowserTitlebar* titlebar);
-
-  // Removes |titlebar| from the list of objects observing button order change
-  // notifications.
-  void RemoveObserver(BrowserTitlebar* titlebar);
-
- protected:
-  virtual ~GConfTitlebarListener();
-
- private:
-  // Private constructor to enforce singleton access.
-  GConfTitlebarListener();
-
-  // Called whenever the metacity key changes.
-  CHROMEG_CALLBACK_2(GConfTitlebarListener, void, OnChangeNotification,
-                     GConfClient*, guint, GConfEntry*);
-
-  // Checks |error|. On error, prints out a message and closes the connection
-  // to GConf and reverts to default mode.
-  bool HandleGError(GError* error, const char* key);
-
-  // Parses the return data structure from GConf, falling back to the default
-  // value on any error.
-  void ParseAndStoreValue(GConfValue* gconf_value);
-
-  // Pointer to our gconf context. NULL if we aren't on a desktop that uses
-  // gconf.
-  GConfClient* client_;
-
-  // The current button ordering as heard from gconf.
-  std::string current_value_;
-
-  // BrowserTitlebar objects which have subscribed to updates.
-  std::set<BrowserTitlebar*> titlebars_;
-
-  friend struct DefaultSingletonTraits<GConfTitlebarListener>;
-  DISALLOW_COPY_AND_ASSIGN(GConfTitlebarListener);
-};
+#include "chrome/browser/ui/gtk/gconf_titlebar_listener.h"
+// TODO(msw): remove this file once all includes have been updated.
 
 #endif  // CHROME_BROWSER_GTK_GCONF_TITLEBAR_LISTENER_H_