gtk: Organize all the bookmark UI files into the chrome/browser/ui/gtk/bookmarks/ directory.

BUG=None
TEST=trybots

Review URL: http://codereview.chromium.org/6598026

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76325 0039d316-1c4b-4281-b951-d872f2087c98

26 files changed, 75 insertions, 75 deletions

diff --git a/chrome/browser/tab_contents/web_drag_dest_gtk.cc b/chrome/browser/tab_contents/web_drag_dest_gtk.cc
index 2a80e7b..4aea47a 100644
--- a/chrome/browser/tab_contents/web_drag_dest_gtk.cc
+++ b/chrome/browser/tab_contents/web_drag_dest_gtk.cc
@@ -11,7 +11,7 @@
 #include "chrome/browser/bookmarks/bookmark_node_data.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/browser/ui/gtk/bookmark_utils_gtk.h"
+#include "chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/common/url_constants.h"
 #include "net/base/net_util.h"
diff --git a/chrome/browser/ui/gtk/bookmark_bar_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc
index adfbda5..9b6d7dd 100644
--- a/chrome/browser/ui/gtk/bookmark_bar_gtk.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/gtk/bookmark_bar_gtk.h"
+#include "chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.h"
 
 #include <vector>
 
@@ -22,9 +22,9 @@
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/gtk/bookmark_menu_controller_gtk.h"
-#include "chrome/browser/ui/gtk/bookmark_tree_model.h"
-#include "chrome/browser/ui/gtk/bookmark_utils_gtk.h"
+#include "chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.h"
+#include "chrome/browser/ui/gtk/bookmarks/bookmark_tree_model.h"
+#include "chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.h"
 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
 #include "chrome/browser/ui/gtk/cairo_cached_surface.h"
 #include "chrome/browser/ui/gtk/custom_button.h"
diff --git a/chrome/browser/ui/gtk/bookmark_bar_gtk.h b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.h
index 3ac4298..c0eed00 100644
--- a/chrome/browser/ui/gtk/bookmark_bar_gtk.h
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_GTK_BOOKMARK_BAR_GTK_H_
-#define CHROME_BROWSER_UI_GTK_BOOKMARK_BAR_GTK_H_
+#ifndef CHROME_BROWSER_UI_GTK_BOOKMARKS_BOOKMARK_BAR_GTK_H_
+#define CHROME_BROWSER_UI_GTK_BOOKMARKS_BOOKMARK_BAR_GTK_H_
 #pragma once
 
 #include <gtk/gtk.h>
@@ -15,7 +15,7 @@
 #include "chrome/browser/bookmarks/bookmark_context_menu_controller.h"
 #include "chrome/browser/bookmarks/bookmark_model_observer.h"
 #include "chrome/browser/sync/profile_sync_service.h"
-#include "chrome/browser/ui/gtk/bookmark_bar_instructions_gtk.h"
+#include "chrome/browser/ui/gtk/bookmarks/bookmark_bar_instructions_gtk.h"
 #include "chrome/browser/ui/gtk/menu_bar_helper.h"
 #include "chrome/browser/ui/gtk/owned_widget_gtk.h"
 #include "chrome/browser/ui/gtk/view_id_util.h"
@@ -407,4 +407,4 @@ class BookmarkBarGtk : public ui::AnimationDelegate,
   ScopedRunnableMethodFactory<BookmarkBarGtk> method_factory_;
 };
 
-#endif  // CHROME_BROWSER_UI_GTK_BOOKMARK_BAR_GTK_H_
+#endif  // CHROME_BROWSER_UI_GTK_BOOKMARKS_BOOKMARK_BAR_GTK_H_
diff --git a/chrome/browser/ui/gtk/bookmark_bar_gtk_interactive_uitest.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_interactive_uitest.cc
index 3518825..3518825 100644
--- a/chrome/browser/ui/gtk/bookmark_bar_gtk_interactive_uitest.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_interactive_uitest.cc
diff --git a/chrome/browser/ui/gtk/bookmark_bar_gtk_unittest.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc
index 9581d50b1..12be6d9 100644
--- a/chrome/browser/ui/gtk/bookmark_bar_gtk_unittest.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/gtk/bookmark_bar_gtk.h"
+#include "chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.h"
 
 #include "base/task.h"
 #include "base/utf_string_conversions.h"
diff --git a/chrome/browser/ui/gtk/bookmark_bar_instructions_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_instructions_gtk.cc
index 522861e..79ff3f6 100644
--- a/chrome/browser/ui/gtk/bookmark_bar_instructions_gtk.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_instructions_gtk.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/gtk/bookmark_bar_instructions_gtk.h"
+#include "chrome/browser/ui/gtk/bookmarks/bookmark_bar_instructions_gtk.h"
 
 #include "base/observer_list.h"
 #include "chrome/browser/ui/gtk/gtk_chrome_link_button.h"
diff --git a/chrome/browser/ui/gtk/bookmark_bar_instructions_gtk.h b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_instructions_gtk.h
index 3cea2d6..0bcbc29 100644
--- a/chrome/browser/ui/gtk/bookmark_bar_instructions_gtk.h
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_instructions_gtk.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_GTK_BOOKMARK_BAR_INSTRUCTIONS_GTK_H_
-#define CHROME_BROWSER_UI_GTK_BOOKMARK_BAR_INSTRUCTIONS_GTK_H_
+#ifndef CHROME_BROWSER_UI_GTK_BOOKMARKS_BOOKMARK_BAR_INSTRUCTIONS_GTK_H_
+#define CHROME_BROWSER_UI_GTK_BOOKMARKS_BOOKMARK_BAR_INSTRUCTIONS_GTK_H_
 #pragma once
 
 #include "base/basictypes.h"
@@ -59,4 +59,4 @@ class BookmarkBarInstructionsGtk : public NotificationObserver {
   DISALLOW_COPY_AND_ASSIGN(BookmarkBarInstructionsGtk);
 };
 
-#endif  // CHROME_BROWSER_UI_GTK_BOOKMARK_BAR_INSTRUCTIONS_GTK_H_
+#endif  // CHROME_BROWSER_UI_GTK_BOOKMARKS_BOOKMARK_BAR_INSTRUCTIONS_GTK_H_
diff --git a/chrome/browser/ui/gtk/bookmark_bubble_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.cc
index 307953b..dfff29d 100644
--- a/chrome/browser/ui/gtk/bookmark_bubble_gtk.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/gtk/bookmark_bubble_gtk.h"
+#include "chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.h"
 
 #include <gtk/gtk.h>
 
diff --git a/chrome/browser/ui/gtk/bookmark_bubble_gtk.h b/chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.h
index 1b40759..ddae38e 100644
--- a/chrome/browser/ui/gtk/bookmark_bubble_gtk.h
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.h
@@ -9,8 +9,8 @@
 // lifetimes, destroying everything and possibly committing any changes when
 // the bubble is closed.
 
-#ifndef CHROME_BROWSER_UI_GTK_BOOKMARK_BUBBLE_GTK_H_
-#define CHROME_BROWSER_UI_GTK_BOOKMARK_BUBBLE_GTK_H_
+#ifndef CHROME_BROWSER_UI_GTK_BOOKMARKS_BOOKMARK_BUBBLE_GTK_H_
+#define CHROME_BROWSER_UI_GTK_BOOKMARKS_BOOKMARK_BUBBLE_GTK_H_
 #pragma once
 
 #include <string>
@@ -126,4 +126,4 @@ class BookmarkBubbleGtk : public InfoBubbleGtkDelegate,
   DISALLOW_COPY_AND_ASSIGN(BookmarkBubbleGtk);
 };
 
-#endif  // CHROME_BROWSER_UI_GTK_BOOKMARK_BUBBLE_GTK_H_
+#endif  // CHROME_BROWSER_UI_GTK_BOOKMARKS_BOOKMARK_BUBBLE_GTK_H_
diff --git a/chrome/browser/ui/gtk/bookmark_editor_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc
index b4c3429..466a078 100644
--- a/chrome/browser/ui/gtk/bookmark_editor_gtk.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/gtk/bookmark_editor_gtk.h"
+#include "chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.h"
 
 #include <gtk/gtk.h>
 
@@ -15,8 +15,8 @@
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/gtk/bookmark_tree_model.h"
-#include "chrome/browser/ui/gtk/bookmark_utils_gtk.h"
+#include "chrome/browser/ui/gtk/bookmarks/bookmark_tree_model.h"
+#include "chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.h"
 #include "chrome/browser/ui/gtk/gtk_theme_provider.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "googleurl/src/gurl.h"
diff --git a/chrome/browser/ui/gtk/bookmark_editor_gtk.h b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.h
index cba0c95..c995b1b 100644
--- a/chrome/browser/ui/gtk/bookmark_editor_gtk.h
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_GTK_BOOKMARK_EDITOR_GTK_H_
-#define CHROME_BROWSER_UI_GTK_BOOKMARK_EDITOR_GTK_H_
+#ifndef CHROME_BROWSER_UI_GTK_BOOKMARKS_BOOKMARK_EDITOR_GTK_H_
+#define CHROME_BROWSER_UI_GTK_BOOKMARKS_BOOKMARK_EDITOR_GTK_H_
 #pragma once
 
 #include "base/gtest_prod_util.h"
@@ -162,4 +162,4 @@ class BookmarkEditorGtk : public BookmarkEditor,
   DISALLOW_COPY_AND_ASSIGN(BookmarkEditorGtk);
 };
 
-#endif  // CHROME_BROWSER_UI_GTK_BOOKMARK_EDITOR_GTK_H_
+#endif  // CHROME_BROWSER_UI_GTK_BOOKMARKS_BOOKMARK_EDITOR_GTK_H_
diff --git a/chrome/browser/ui/gtk/bookmark_editor_gtk_unittest.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc
index c628c69..356fa25 100644
--- a/chrome/browser/ui/gtk/bookmark_editor_gtk_unittest.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc
@@ -10,8 +10,8 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser_thread.h"
-#include "chrome/browser/ui/gtk/bookmark_editor_gtk.h"
-#include "chrome/browser/ui/gtk/bookmark_tree_model.h"
+#include "chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.h"
+#include "chrome/browser/ui/gtk/bookmarks/bookmark_tree_model.h"
 #include "chrome/test/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome/browser/ui/gtk/bookmark_menu_controller_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.cc
index aaac8d8..a617334 100644
--- a/chrome/browser/ui/gtk/bookmark_menu_controller_gtk.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/gtk/bookmark_menu_controller_gtk.h"
+#include "chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.h"
 
 #include <gtk/gtk.h>
 
@@ -12,7 +12,7 @@
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/page_navigator.h"
-#include "chrome/browser/ui/gtk/bookmark_utils_gtk.h"
+#include "chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.h"
 #include "chrome/browser/ui/gtk/gtk_chrome_button.h"
 #include "chrome/browser/ui/gtk/gtk_theme_provider.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
diff --git a/chrome/browser/ui/gtk/bookmark_menu_controller_gtk.h b/chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.h
index e82f828..0b07a49 100644
--- a/chrome/browser/ui/gtk/bookmark_menu_controller_gtk.h
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_GTK_BOOKMARK_MENU_CONTROLLER_GTK_H_
-#define CHROME_BROWSER_UI_GTK_BOOKMARK_MENU_CONTROLLER_GTK_H_
+#ifndef CHROME_BROWSER_UI_GTK_BOOKMARKS_BOOKMARK_MENU_CONTROLLER_GTK_H_
+#define CHROME_BROWSER_UI_GTK_BOOKMARKS_BOOKMARK_MENU_CONTROLLER_GTK_H_
 #pragma once
 
 #include <map>
@@ -142,4 +142,4 @@ class BookmarkMenuController : public BaseBookmarkModelObserver,
   DISALLOW_COPY_AND_ASSIGN(BookmarkMenuController);
 };
 
-#endif  // CHROME_BROWSER_UI_GTK_BOOKMARK_MENU_CONTROLLER_GTK_H_
+#endif  // CHROME_BROWSER_UI_GTK_BOOKMARKS_BOOKMARK_MENU_CONTROLLER_GTK_H_
diff --git a/chrome/browser/ui/gtk/bookmark_tree_model.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_tree_model.cc
index 8904976..c4a3df6 100644
--- a/chrome/browser/ui/gtk/bookmark_tree_model.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_tree_model.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/gtk/bookmark_tree_model.h"
+#include "chrome/browser/ui/gtk/bookmarks/bookmark_tree_model.h"
 
 #include <gtk/gtk.h>
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
-#include "chrome/browser/ui/gtk/bookmark_utils_gtk.h"
+#include "chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.h"
 #include "chrome/browser/ui/gtk/gtk_theme_provider.h"
 
 namespace {
diff --git a/chrome/browser/ui/gtk/bookmark_tree_model.h b/chrome/browser/ui/gtk/bookmarks/bookmark_tree_model.h
index 9b3a78b..d0b73e6b 100644
--- a/chrome/browser/ui/gtk/bookmark_tree_model.h
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_tree_model.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_GTK_BOOKMARK_TREE_MODEL_H_
-#define CHROME_BROWSER_UI_GTK_BOOKMARK_TREE_MODEL_H_
+#ifndef CHROME_BROWSER_UI_GTK_BOOKMARKS_BOOKMARK_TREE_MODEL_H_
+#define CHROME_BROWSER_UI_GTK_BOOKMARKS_BOOKMARK_TREE_MODEL_H_
 #pragma once
 
 #include "base/basictypes.h"
@@ -74,4 +74,4 @@ string16 GetTitleFromTreeIter(GtkTreeModel* model, GtkTreeIter* iter);
 
 }  // namespace bookmark_utils
 
-#endif  // CHROME_BROWSER_UI_GTK_BOOKMARK_TREE_MODEL_H_
+#endif  // CHROME_BROWSER_UI_GTK_BOOKMARKS_BOOKMARK_TREE_MODEL_H_
diff --git a/chrome/browser/ui/gtk/bookmark_utils_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc
index be236af..3f99f84 100644
--- a/chrome/browser/ui/gtk/bookmark_utils_gtk.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/gtk/bookmark_utils_gtk.h"
+#include "chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.h"
 
 #include "base/pickle.h"
 #include "base/string16.h"
diff --git a/chrome/browser/ui/gtk/bookmark_utils_gtk.h b/chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.h
index 9654d9d..49e10a0 100644
--- a/chrome/browser/ui/gtk/bookmark_utils_gtk.h
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_GTK_BOOKMARK_UTILS_GTK_H_
-#define CHROME_BROWSER_UI_GTK_BOOKMARK_UTILS_GTK_H_
+#ifndef CHROME_BROWSER_UI_GTK_BOOKMARKS_BOOKMARK_UTILS_GTK_H_
+#define CHROME_BROWSER_UI_GTK_BOOKMARKS_BOOKMARK_UTILS_GTK_H_
 #pragma once
 
-#include <vector>
 #include <string>
+#include <vector>
 
 #include "base/string16.h"
 #include "ui/base/gtk/gtk_integers.h"
@@ -107,4 +107,4 @@ bool CreateNewBookmarkFromNetscapeURL(
 
 }  // namespace bookmark_utils
 
-#endif  // CHROME_BROWSER_UI_GTK_BOOKMARK_UTILS_GTK_H_
+#endif  // CHROME_BROWSER_UI_GTK_BOOKMARKS_BOOKMARK_UTILS_GTK_H_
diff --git a/chrome/browser/ui/gtk/bookmark_utils_gtk_unittest.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk_unittest.cc
index ffef87c..fa790fc 100644
--- a/chrome/browser/ui/gtk/bookmark_utils_gtk_unittest.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/gtk/bookmark_utils_gtk.h"
+#include "chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/dragdrop/gtk_dnd_util.h"
 
diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc
index e6b6eb4..9621a6c 100644
--- a/chrome/browser/ui/gtk/browser_window_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_window_gtk.cc
@@ -40,7 +40,7 @@
 #include "chrome/browser/ui/find_bar/find_tab_helper.h"
 #include "chrome/browser/ui/gtk/about_chrome_dialog.h"
 #include "chrome/browser/ui/gtk/accelerators_gtk.h"
-#include "chrome/browser/ui/gtk/bookmark_bar_gtk.h"
+#include "chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.h"
 #include "chrome/browser/ui/gtk/browser_titlebar.h"
 #include "chrome/browser/ui/gtk/browser_toolbar_gtk.h"
 #include "chrome/browser/ui/gtk/cairo_cached_surface.h"
diff --git a/chrome/browser/ui/gtk/custom_drag.cc b/chrome/browser/ui/gtk/custom_drag.cc
index 8b8edb9..23fa7ca 100644
--- a/chrome/browser/ui/gtk/custom_drag.cc
+++ b/chrome/browser/ui/gtk/custom_drag.cc
@@ -6,7 +6,7 @@
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/download/download_item.h"
-#include "chrome/browser/ui/gtk/bookmark_utils_gtk.h"
+#include "chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
 #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.cc b/chrome/browser/ui/gtk/location_bar_view_gtk.cc
index 13dcc4e..1c1057c 100644
--- a/chrome/browser/ui/gtk/location_bar_view_gtk.cc
+++ b/chrome/browser/ui/gtk/location_bar_view_gtk.cc
@@ -33,8 +33,8 @@
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/gtk/bookmark_bubble_gtk.h"
-#include "chrome/browser/ui/gtk/bookmark_utils_gtk.h"
+#include "chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.h"
+#include "chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.h"
 #include "chrome/browser/ui/gtk/cairo_cached_surface.h"
 #include "chrome/browser/ui/gtk/content_setting_bubble_gtk.h"
 #include "chrome/browser/ui/gtk/extension_popup_gtk.h"
diff --git a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc
index 19b20a5..9341ef5 100644
--- a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc
+++ b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc
@@ -12,7 +12,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/gtk/bookmark_utils_gtk.h"
+#include "chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.h"
 #include "chrome/browser/ui/gtk/custom_button.h"
 #include "chrome/browser/ui/gtk/gtk_theme_provider.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
diff --git a/chrome/browser/ui/webui/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp_resource_cache.cc
index 3f2a340..c0636c7 100644
--- a/chrome/browser/ui/webui/ntp_resource_cache.cc
+++ b/chrome/browser/ui/webui/ntp_resource_cache.cc
@@ -47,7 +47,7 @@
 #elif defined(OS_MACOSX)
 #include "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h"
 #elif defined(OS_POSIX)
-#include "chrome/browser/ui/gtk/bookmark_bar_gtk.h"
+#include "chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.h"
 #endif
 
 using base::Time;
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index aa1269b..ac85555 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2511,20 +2511,20 @@
         'browser/ui/gtk/accelerators_gtk.h',
         'browser/ui/gtk/back_forward_button_gtk.cc',
         'browser/ui/gtk/back_forward_button_gtk.h',
-        'browser/ui/gtk/bookmark_bar_gtk.cc',
-        'browser/ui/gtk/bookmark_bar_gtk.h',
-        'browser/ui/gtk/bookmark_bar_instructions_gtk.cc',
-        'browser/ui/gtk/bookmark_bar_instructions_gtk.h',
-        'browser/ui/gtk/bookmark_bubble_gtk.cc',
-        'browser/ui/gtk/bookmark_bubble_gtk.h',
-        'browser/ui/gtk/bookmark_editor_gtk.cc',
-        'browser/ui/gtk/bookmark_editor_gtk.h',
-        'browser/ui/gtk/bookmark_menu_controller_gtk.cc',
-        'browser/ui/gtk/bookmark_menu_controller_gtk.h',
-        'browser/ui/gtk/bookmark_tree_model.cc',
-        'browser/ui/gtk/bookmark_tree_model.h',
-        'browser/ui/gtk/bookmark_utils_gtk.cc',
-        'browser/ui/gtk/bookmark_utils_gtk.h',
+        'browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc',
+        'browser/ui/gtk/bookmarks/bookmark_bar_gtk.h',
+        'browser/ui/gtk/bookmarks/bookmark_bar_instructions_gtk.cc',
+        'browser/ui/gtk/bookmarks/bookmark_bar_instructions_gtk.h',
+        'browser/ui/gtk/bookmarks/bookmark_bubble_gtk.cc',
+        'browser/ui/gtk/bookmarks/bookmark_bubble_gtk.h',
+        'browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc',
+        'browser/ui/gtk/bookmarks/bookmark_editor_gtk.h',
+        'browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.cc',
+        'browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.h',
+        'browser/ui/gtk/bookmarks/bookmark_tree_model.cc',
+        'browser/ui/gtk/bookmarks/bookmark_tree_model.h',
+        'browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc',
+        'browser/ui/gtk/bookmarks/bookmark_utils_gtk.h',
         'browser/ui/gtk/browser_actions_toolbar_gtk.cc',
         'browser/ui/gtk/browser_actions_toolbar_gtk.h',
         'browser/ui/gtk/browser_titlebar.cc',
@@ -3781,12 +3781,12 @@
 
                 # Exclude all of browser/ui/gtk, then include the things we want.
                 ['exclude', '^browser/ui/gtk'],
-                ['include', '^browser/ui/gtk/bookmark_editor_gtk.cc'],
-                ['include', '^browser/ui/gtk/bookmark_editor_gtk.h'],
-                ['include', '^browser/ui/gtk/bookmark_tree_model.cc'],
-                ['include', '^browser/ui/gtk/bookmark_tree_model.h'],
-                ['include', '^browser/ui/gtk/bookmark_utils_gtk.cc'],
-                ['include', '^browser/ui/gtk/bookmark_utils_gtk.h'],
+                ['include', '^browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc'],
+                ['include', '^browser/ui/gtk/bookmarks/bookmark_editor_gtk.h'],
+                ['include', '^browser/ui/gtk/bookmarks/bookmark_tree_model.cc'],
+                ['include', '^browser/ui/gtk/bookmarks/bookmark_tree_model.h'],
+                ['include', '^browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc'],
+                ['include', '^browser/ui/gtk/bookmarks/bookmark_utils_gtk.h'],
                 ['include', '^browser/ui/gtk/cairo_cached_surface.cc'],
                 ['include', '^browser/ui/gtk/cairo_cached_surface.h'],
                 ['include', '^browser/ui/gtk/certificate_dialogs.cc'],
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 340ba33..695b9d0 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -379,7 +379,7 @@
         'browser/browser_keyevents_browsertest.cc',
         'browser/collected_cookies_uitest.cc',
         'browser/debugger/devtools_sanity_unittest.cc',
-        'browser/ui/gtk/bookmark_bar_gtk_interactive_uitest.cc',
+        'browser/ui/gtk/bookmarks/bookmark_bar_gtk_interactive_uitest.cc',
         'browser/instant/instant_browsertest.cc',
         'browser/notifications/notifications_interactive_uitest.cc',
         'browser/ui/views/bookmark_bar_view_test.cc',
@@ -417,7 +417,7 @@
         }],
         ['OS=="linux" and toolkit_views==1', {
           'sources!': [
-            'browser/ui/gtk/bookmark_bar_gtk_interactive_uitest.cc',
+            'browser/ui/gtk/bookmarks/bookmark_bar_gtk_interactive_uitest.cc',
             # TODO(port)
             'test/interactive_ui/npapi_interactive_test.cc',
           ],
@@ -1307,9 +1307,9 @@
         'browser/global_keyboard_shortcuts_mac_unittest.mm',
         'browser/google/google_update_settings_unittest.cc',
         'browser/google/google_url_tracker_unittest.cc',
-        'browser/ui/gtk/bookmark_bar_gtk_unittest.cc',
-        'browser/ui/gtk/bookmark_editor_gtk_unittest.cc',
-        'browser/ui/gtk/bookmark_utils_gtk_unittest.cc',
+        'browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc',
+        'browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc',
+        'browser/ui/gtk/bookmarks/bookmark_utils_gtk_unittest.cc',
         'browser/ui/gtk/gtk_chrome_shrinkable_hbox_unittest.cc',
         'browser/ui/gtk/gtk_expanded_container_unittest.cc',
         'browser/ui/gtk/gtk_theme_provider_unittest.cc',
@@ -1905,8 +1905,8 @@
             ['toolkit_views==1', {
               'sources!': [
                  'browser/autocomplete/autocomplete_popup_view_gtk_unittest.cc',
-                 'browser/ui/gtk/bookmark_bar_gtk_unittest.cc',
-                 'browser/ui/gtk/bookmark_editor_gtk_unittest.cc',
+                 'browser/ui/gtk/bookmarks/bookmark_bar_gtk_unittest.cc',
+                 'browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc',
                  'browser/ui/gtk/gtk_chrome_shrinkable_hbox_unittest.cc',
                  'browser/ui/gtk/gtk_expanded_container_unittest.cc',
                  'browser/ui/gtk/gtk_theme_provider_unittest.cc',