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

chrome/browser/gtk/status_icons/status_icon_gtk.h

Index: chrome/browser/gtk/status_icons/status_icon_gtk.h
diff --git a/chrome/browser/gtk/status_icons/status_icon_gtk.h b/chrome/browser/gtk/status_icons/status_icon_gtk.h
index 7053ed5e6f08e55b9095169f315d70ddfa593ce1..216d65c3fe00b103fe4e7dd9e4ea2e0053000e2b 100644
--- a/chrome/browser/gtk/status_icons/status_icon_gtk.h
+++ b/chrome/browser/gtk/status_icons/status_icon_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,42 +6,7 @@
 #define CHROME_BROWSER_GTK_STATUS_ICONS_STATUS_ICON_GTK_H_
 #pragma once
 
-#include <gtk/gtk.h>
-
-#include "app/gtk_signal.h"
-#include "chrome/browser/status_icons/status_icon.h"
-
-class MenuGtk;
-class SkBitmap;
-
-class StatusIconGtk : public StatusIcon {
- public:
-  StatusIconGtk();
-  virtual ~StatusIconGtk();
-
-  // Overridden from StatusIcon:
-  virtual void SetImage(const SkBitmap& image);
-  virtual void SetPressedImage(const SkBitmap& image);
-  virtual void SetToolTip(const string16& tool_tip);
-
-  // Exposed for testing.
-  CHROMEGTK_CALLBACK_0(StatusIconGtk, void, OnClick);
-
- protected:
-  // Overridden from StatusIcon.
-  virtual void UpdatePlatformContextMenu(menus::MenuModel* menu);
-
- private:
-  // Callback invoked when user right-clicks on the status icon.
-  CHROMEGTK_CALLBACK_2(StatusIconGtk, void, OnPopupMenu, guint, guint);
-
-  // The currently-displayed icon for the window.
-  GtkStatusIcon* icon_;
-
-  // The context menu for this icon (if any).
-  scoped_ptr<MenuGtk> menu_;
-
-  DISALLOW_COPY_AND_ASSIGN(StatusIconGtk);
-};
+#include "chrome/browser/ui/gtk/status_icons/status_icon_gtk.h"
+// TODO(msw): remove this file once all includes have been updated.
 
 #endif  // CHROME_BROWSER_GTK_STATUS_ICONS_STATUS_ICON_GTK_H_