1 files changed, 3 insertions, 101 deletions
diff --git a/chrome/browser/gtk/bookmark_utils_gtk.h b/chrome/browser/gtk/bookmark_utils_gtk.h
index 1ebc627..d49d136 100644
--- a/chrome/browser/gtk/bookmark_utils_gtk.h
+++ b/chrome/browser/gtk/bookmark_utils_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,105 +6,7 @@
 #define CHROME_BROWSER_GTK_BOOKMARK_UTILS_GTK_H_
 #pragma once
 
-#include <vector>
-#include <string>
-
-#include "app/gtk_integers.h"
-#include "base/string16.h"
-
-class BookmarkModel;
-class BookmarkNode;
-class GtkThemeProvider;
-class Profile;
-
-typedef struct _GdkDragContext GdkDragContext;
-typedef struct _GdkPixbuf GdkPixbuf;
-typedef struct _GtkSelectionData GtkSelectionData;
-typedef struct _GtkWidget GtkWidget;
-
-namespace bookmark_utils {
-
-extern const char kBookmarkNode[];
-
-// Get the image that is used to represent the node. This function adds a ref
-// to the returned pixbuf, so it requires a matching call to g_object_unref().
-GdkPixbuf* GetPixbufForNode(const BookmarkNode* node, BookmarkModel* model,
-                            bool native);
-
-// Returns a GtkWindow with a visual hierarchy for passing to
-// gtk_drag_set_icon_widget().
-GtkWidget* GetDragRepresentation(GdkPixbuf* pixbuf,
-                                 const string16& title,
-                                 GtkThemeProvider* provider);
-GtkWidget* GetDragRepresentationForNode(const BookmarkNode* node,
-                                        BookmarkModel* model,
-                                        GtkThemeProvider* provider);
-
-// Helper function that sets visual properties of GtkButton |button| to the
-// contents of |node|.
-void ConfigureButtonForNode(const BookmarkNode* node, BookmarkModel* model,
-                            GtkWidget* button, GtkThemeProvider* provider);
-
-// Returns the tooltip.
-std::string BuildTooltipFor(const BookmarkNode* node);
-
-// Returns the "bookmark-node" property of |widget| casted to the correct type.
-const BookmarkNode* BookmarkNodeForWidget(GtkWidget* widget);
-
-// Set the colors on |label| as per the theme.
-void SetButtonTextColors(GtkWidget* label, GtkThemeProvider* provider);
-
-// Drag and drop. --------------------------------------------------------------
-
-// Get the DnD target mask for a bookmark drag. This will vary based on whether
-// the node in question is a folder.
-int GetCodeMask(bool folder);
-
-// Pickle a node into a GtkSelection.
-void WriteBookmarkToSelection(const BookmarkNode* node,
-                              GtkSelectionData* selection_data,
-                              guint target_type,
-                              Profile* profile);
-
-// Pickle a vector of nodes into a GtkSelection.
-void WriteBookmarksToSelection(const std::vector<const BookmarkNode*>& nodes,
-                               GtkSelectionData* selection_data,
-                               guint target_type,
-                               Profile* profile);
-
-// Un-pickle node(s) from a GtkSelection.
-// The last two arguments are out parameters.
-std::vector<const BookmarkNode*> GetNodesFromSelection(
-    GdkDragContext* context,
-    GtkSelectionData* selection_data,
-    guint target_type,
-    Profile* profile,
-    gboolean* delete_selection_data,
-    gboolean* dnd_success);
-
-// Unpickle a new bookmark of the CHROME_NAMED_URL drag type, and put it in
-// the appropriate location in the model.
-bool CreateNewBookmarkFromNamedUrl(
-    GtkSelectionData* selection_data,
-    BookmarkModel* model,
-    const BookmarkNode* parent,
-    int idx);
-
-// Add the URIs in |selection_data| into the model at the given position. They
-// will be added whether or not the URL is valid.
-bool CreateNewBookmarksFromURIList(
-    GtkSelectionData* selection_data,
-    BookmarkModel* model,
-    const BookmarkNode* parent,
-    int idx);
-
-// Add the "url\ntitle" combination into the model at the given position.
-bool CreateNewBookmarkFromNetscapeURL(
-    GtkSelectionData* selection_data,
-    BookmarkModel* model,
-    const BookmarkNode* parent,
-    int idx);
-
-}  // namespace bookmark_utils
+#include "chrome/browser/ui/gtk/bookmark_utils_gtk.h"
+// TODO(msw): remove this file once all includes have been updated.
 
 #endif  // CHROME_BROWSER_GTK_BOOKMARK_UTILS_GTK_H_