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

BUG=None
TEST=trybots

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

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

26 files changed, 90 insertions, 90 deletions

diff --git a/chrome/browser/accessibility/browser_views_accessibility_browsertest.cc b/chrome/browser/accessibility/browser_views_accessibility_browsertest.cc
index 655d25d1..40c60cb5d 100644
--- a/chrome/browser/accessibility/browser_views_accessibility_browsertest.cc
+++ b/chrome/browser/accessibility/browser_views_accessibility_browsertest.cc
@@ -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.
 
@@ -9,7 +9,7 @@
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/view_ids.h"
-#include "chrome/browser/ui/views/bookmark_bar_view.h"
+#include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/toolbar_view.h"
 #include "chrome/common/url_constants.h"
diff --git a/chrome/browser/automation/automation_provider_win.cc b/chrome/browser/automation/automation_provider_win.cc
index e0f76c9..e4255eb 100644
--- a/chrome/browser/automation/automation_provider_win.cc
+++ b/chrome/browser/automation/automation_provider_win.cc
@@ -20,7 +20,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/browser/ui/views/bookmark_bar_view.h"
+#include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
 #include "chrome/common/automation_messages.h"
 #include "chrome/common/page_zoom.h"
 #include "ui/base/keycodes/keyboard_codes.h"
diff --git a/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc b/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc
index 398526f..8219e8c 100644
--- a/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc
@@ -18,7 +18,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_WIN)
-#include "chrome/browser/ui/views/bookmark_bar_view.h"
+#include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
 #endif
 
 // PageNavigator implementation that records the URL.
diff --git a/chrome/browser/ui/views/bookmark_bar_instructions_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.cc
index b4c3351..78f19ab 100644
--- a/chrome/browser/ui/views/bookmark_bar_instructions_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.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/views/bookmark_bar_instructions_view.h"
+#include "chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/defaults.h"
diff --git a/chrome/browser/ui/views/bookmark_bar_instructions_view.h b/chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h
index f2f0f23..3b6bf13 100644
--- a/chrome/browser/ui/views/bookmark_bar_instructions_view.h
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h
@@ -1,13 +1,13 @@
-// 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.
 
-#ifndef CHROME_BROWSER_UI_VIEWS_BOOKMARK_BAR_INSTRUCTIONS_VIEW_H_
-#define CHROME_BROWSER_UI_VIEWS_BOOKMARK_BAR_INSTRUCTIONS_VIEW_H_
+#ifndef CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_INSTRUCTIONS_VIEW_H_
+#define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_INSTRUCTIONS_VIEW_H_
 #pragma once
 
-#include "views/view.h"
 #include "views/controls/link.h"
+#include "views/view.h"
 
 namespace views {
 class Label;
@@ -65,4 +65,4 @@ class BookmarkBarInstructionsView : public views::View,
   DISALLOW_COPY_AND_ASSIGN(BookmarkBarInstructionsView);
 };
 
-#endif  // CHROME_BROWSER_UI_VIEWS_BOOKMARK_BAR_INSTRUCTIONS_VIEW_H_
+#endif  // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_INSTRUCTIONS_VIEW_H_
diff --git a/chrome/browser/ui/views/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
index 7de11f3..dcb138b 100644
--- a/chrome/browser/ui/views/bookmark_bar_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.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/views/bookmark_bar_view.h"
+#include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
 
 #include <algorithm>
 #include <limits>
@@ -29,7 +29,7 @@
 #include "chrome/browser/themes/browser_theme_provider.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/view_ids.h"
-#include "chrome/browser/ui/views/bookmark_context_menu.h"
+#include "chrome/browser/ui/views/bookmarks/bookmark_context_menu.h"
 #include "chrome/browser/ui/views/event_utils.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
diff --git a/chrome/browser/ui/views/bookmark_bar_view.h b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h
index 2f4cf53..5737e7c 100644
--- a/chrome/browser/ui/views/bookmark_bar_view.h
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_VIEWS_BOOKMARK_BAR_VIEW_H_
-#define CHROME_BROWSER_UI_VIEWS_BOOKMARK_BAR_VIEW_H_
+#ifndef CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_
+#define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_
 #pragma once
 
 #include <set>
 
-#include "chrome/browser/bookmarks/bookmark_node_data.h"
 #include "chrome/browser/bookmarks/bookmark_model_observer.h"
+#include "chrome/browser/bookmarks/bookmark_node_data.h"
 #include "chrome/browser/sync/profile_sync_service.h"
-#include "chrome/browser/ui/views/bookmark_bar_instructions_view.h"
-#include "chrome/browser/ui/views/bookmark_menu_controller_views.h"
+#include "chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h"
+#include "chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h"
 #include "chrome/browser/ui/views/detachable_toolbar_view.h"
 #include "chrome/common/notification_registrar.h"
 #include "ui/base/animation/animation_delegate.h"
@@ -520,4 +520,4 @@ class BookmarkBarView : public DetachableToolbarView,
   DISALLOW_COPY_AND_ASSIGN(BookmarkBarView);
 };
 
-#endif  // CHROME_BROWSER_UI_VIEWS_BOOKMARK_BAR_VIEW_H_
+#endif  // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_
diff --git a/chrome/browser/ui/views/bookmark_bar_view_test.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
index 2dd5f79..d692588 100644
--- a/chrome/browser/ui/views/bookmark_bar_view_test.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
@@ -11,11 +11,11 @@
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/page_navigator.h"
-#include "chrome/browser/ui/views/bookmark_bar_view.h"
+#include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
-#include "chrome/test/testing_profile.h"
 #include "chrome/test/interactive_ui/view_event_test_base.h"
+#include "chrome/test/testing_profile.h"
 #include "chrome/test/ui_test_utils.h"
 #include "grit/generated_resources.h"
 #include "ui/base/clipboard/clipboard.h"
diff --git a/chrome/browser/ui/views/bookmark_bar_view_unittest.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc
index f572981..8fdcaa1 100644
--- a/chrome/browser/ui/views/bookmark_bar_view_unittest.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
-#include "chrome/browser/ui/views/bookmark_bar_view.h"
+#include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
 #include "chrome/test/browser_with_test_window_test.h"
 #include "chrome/test/testing_profile.h"
 #include "content/browser/browser_thread.h"
diff --git a/chrome/browser/ui/views/bookmark_bubble_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
index d9660c0..9c2ca9e 100644
--- a/chrome/browser/ui/views/bookmark_bubble_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.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/views/bookmark_bubble_view.h"
+#include "chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h"
 
 #include "base/string16.h"
 #include "base/string_util.h"
diff --git a/chrome/browser/ui/views/bookmark_bubble_view.h b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h
index 353fb7f..c691c79 100644
--- a/chrome/browser/ui/views/bookmark_bubble_view.h
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.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_VIEWS_BOOKMARK_BUBBLE_VIEW_H_
-#define CHROME_BROWSER_UI_VIEWS_BOOKMARK_BUBBLE_VIEW_H_
+#ifndef CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BUBBLE_VIEW_H_
+#define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BUBBLE_VIEW_H_
 #pragma once
 
 #include "base/string16.h"
@@ -155,4 +155,4 @@ class BookmarkBubbleView : public views::View,
   DISALLOW_COPY_AND_ASSIGN(BookmarkBubbleView);
 };
 
-#endif  // CHROME_BROWSER_UI_VIEWS_BOOKMARK_BUBBLE_VIEW_H_
+#endif  // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BUBBLE_VIEW_H_
diff --git a/chrome/browser/ui/views/bookmark_context_menu.cc b/chrome/browser/ui/views/bookmarks/bookmark_context_menu.cc
index 44a8618..cca2987 100644
--- a/chrome/browser/ui/views/bookmark_context_menu.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_context_menu.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/views/bookmark_context_menu.h"
+#include "chrome/browser/ui/views/bookmarks/bookmark_context_menu.h"
 
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
diff --git a/chrome/browser/ui/views/bookmark_context_menu.h b/chrome/browser/ui/views/bookmarks/bookmark_context_menu.h
index 86befa4..81463aa 100644
--- a/chrome/browser/ui/views/bookmark_context_menu.h
+++ b/chrome/browser/ui/views/bookmarks/bookmark_context_menu.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_VIEWS_BOOKMARK_CONTEXT_MENU_H_
-#define CHROME_BROWSER_UI_VIEWS_BOOKMARK_CONTEXT_MENU_H_
+#ifndef CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_CONTEXT_MENU_H_
+#define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_CONTEXT_MENU_H_
 #pragma once
 
-#include "chrome/browser/ui/views/bookmark_context_menu_controller_views.h"
+#include "chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.h"
 #include "views/controls/menu/menu_delegate.h"
 
 // Observer for the BookmarkContextMenu.
@@ -72,4 +72,4 @@ class BookmarkContextMenu : public BookmarkContextMenuControllerViewsDelegate,
   DISALLOW_COPY_AND_ASSIGN(BookmarkContextMenu);
 };
 
-#endif  // CHROME_BROWSER_UI_VIEWS_BOOKMARK_CONTEXT_MENU_H_
+#endif  // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_CONTEXT_MENU_H_
diff --git a/chrome/browser/ui/views/bookmark_context_menu_controller_views.cc b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc
index 3234403..0bc3d50 100644
--- a/chrome/browser/ui/views/bookmark_context_menu_controller_views.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.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/views/bookmark_context_menu_controller_views.h"
+#include "chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.h"
 
 #include "base/compiler_specific.h"
 #include "chrome/app/chrome_command_ids.h"
diff --git a/chrome/browser/ui/views/bookmark_context_menu_controller_views.h b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.h
index d63727b..b530dea 100644
--- a/chrome/browser/ui/views/bookmark_context_menu_controller_views.h
+++ b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.h
@@ -1,9 +1,9 @@
-// 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.
 
-#ifndef CHROME_BROWSER_UI_VIEWS_BOOKMARK_CONTEXT_MENU_CONTROLLER_VIEWS_H_
-#define CHROME_BROWSER_UI_VIEWS_BOOKMARK_CONTEXT_MENU_CONTROLLER_VIEWS_H_
+#ifndef CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_CONTEXT_MENU_CONTROLLER_VIEWS_H_
+#define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_CONTEXT_MENU_CONTROLLER_VIEWS_H_
 #pragma once
 
 #include <vector>
@@ -89,4 +89,4 @@ class BookmarkContextMenuControllerViews : public BaseBookmarkModelObserver {
   DISALLOW_COPY_AND_ASSIGN(BookmarkContextMenuControllerViews);
 };
 
-#endif  // CHROME_BROWSER_UI_VIEWS_BOOKMARK_CONTEXT_MENU_CONTROLLER_VIEWS_H_
+#endif  // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_CONTEXT_MENU_CONTROLLER_VIEWS_H_
diff --git a/chrome/browser/ui/views/bookmark_context_menu_test.cc b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_test.cc
index f50df3b..cf5ceba 100644
--- a/chrome/browser/ui/views/bookmark_context_menu_test.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_test.cc
@@ -11,7 +11,7 @@
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/views/bookmark_context_menu.h"
+#include "chrome/browser/ui/views/bookmarks/bookmark_context_menu.h"
 #include "chrome/test/testing_profile.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/tab_contents/page_navigator.h"
@@ -19,7 +19,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_WIN)
-#include "chrome/browser/ui/views/bookmark_bar_view.h"
+#include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
 #endif
 
 namespace {
diff --git a/chrome/browser/ui/views/bookmark_editor_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc
index 9a685c2..a06cec5 100644
--- a/chrome/browser/ui/views/bookmark_editor_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.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/views/bookmark_editor_view.h"
+#include "chrome/browser/ui/views/bookmarks/bookmark_editor_view.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
@@ -11,9 +11,9 @@
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/history/history.h"
+#include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/common/pref_names.h"
 #include "googleurl/src/gurl.h"
 #include "grit/chromium_strings.h"
@@ -22,10 +22,10 @@
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "views/background.h"
-#include "views/focus/focus_manager.h"
 #include "views/controls/button/native_button.h"
 #include "views/controls/label.h"
 #include "views/controls/menu/menu_2.h"
+#include "views/focus/focus_manager.h"
 #include "views/layout/grid_layout.h"
 #include "views/layout/layout_constants.h"
 #include "views/widget/widget.h"
diff --git a/chrome/browser/ui/views/bookmark_editor_view.h b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h
index d090c48..0271399 100644
--- a/chrome/browser/ui/views/bookmark_editor_view.h
+++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h
@@ -1,21 +1,21 @@
-// 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.
 
-#ifndef CHROME_BROWSER_UI_VIEWS_BOOKMARK_EDITOR_VIEW_H_
-#define CHROME_BROWSER_UI_VIEWS_BOOKMARK_EDITOR_VIEW_H_
+#ifndef CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_EDITOR_VIEW_H_
+#define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_EDITOR_VIEW_H_
 #pragma once
 
 #include "base/string16.h"
 #include "chrome/browser/bookmarks/bookmark_editor.h"
 #include "chrome/browser/bookmarks/bookmark_model_observer.h"
+#include "testing/gtest/include/gtest/gtest_prod.h"
+#include "ui/base/models/simple_menu_model.h"
+#include "ui/base/models/tree_node_model.h"
 #include "views/controls/button/button.h"
 #include "views/controls/textfield/textfield.h"
 #include "views/controls/tree/tree_view.h"
 #include "views/window/dialog_delegate.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
-#include "ui/base/models/simple_menu_model.h"
-#include "ui/base/models/tree_node_model.h"
 
 namespace views {
 class Label;
@@ -263,4 +263,4 @@ class BookmarkEditorView : public BookmarkEditor,
   DISALLOW_COPY_AND_ASSIGN(BookmarkEditorView);
 };
 
-#endif  // CHROME_BROWSER_UI_VIEWS_BOOKMARK_EDITOR_VIEW_H_
+#endif  // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_EDITOR_VIEW_H_
diff --git a/chrome/browser/ui/views/bookmark_editor_view_unittest.cc b/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc
index 929515e..7c937f8 100644
--- a/chrome/browser/ui/views/bookmark_editor_view_unittest.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc
@@ -9,7 +9,7 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/views/bookmark_editor_view.h"
+#include "chrome/browser/ui/views/bookmarks/bookmark_editor_view.h"
 #include "chrome/test/testing_profile.h"
 #include "content/browser/browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/ui/views/bookmark_menu_controller_views.cc b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc
index b316eef..7090eec 100644
--- a/chrome/browser/ui/views/bookmark_menu_controller_views.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/views/bookmark_menu_controller_views.h"
+#include "chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h"
 
 #include "base/stl_util-inl.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/bookmarks/bookmark_node_data.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
+#include "chrome/browser/bookmarks/bookmark_node_data.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/page_navigator.h"
-#include "chrome/browser/ui/views/bookmark_bar_view.h"
+#include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
 #include "chrome/browser/ui/views/event_utils.h"
 #include "chrome/common/page_transition_types.h"
 #include "grit/app_resources.h"
diff --git a/chrome/browser/ui/views/bookmark_menu_controller_views.h b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h
index ea9821a..0e77b45 100644
--- a/chrome/browser/ui/views/bookmark_menu_controller_views.h
+++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.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_VIEWS_BOOKMARK_MENU_CONTROLLER_VIEWS_H_
-#define CHROME_BROWSER_UI_VIEWS_BOOKMARK_MENU_CONTROLLER_VIEWS_H_
+#ifndef CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_MENU_CONTROLLER_VIEWS_H_
+#define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_MENU_CONTROLLER_VIEWS_H_
 #pragma once
 
 #include <map>
@@ -11,7 +11,7 @@
 
 #include "chrome/browser/bookmarks/base_bookmark_model_observer.h"
 #include "chrome/browser/bookmarks/bookmark_node_data.h"
-#include "chrome/browser/ui/views/bookmark_context_menu.h"
+#include "chrome/browser/ui/views/bookmarks/bookmark_context_menu.h"
 #include "ui/gfx/native_widget_types.h"
 #include "views/controls/menu/menu_delegate.h"
 #include "views/controls/menu/menu_item_view.h"
@@ -203,4 +203,4 @@ class BookmarkMenuController : public BaseBookmarkModelObserver,
   DISALLOW_COPY_AND_ASSIGN(BookmarkMenuController);
 };
 
-#endif  // CHROME_BROWSER_UI_VIEWS_BOOKMARK_MENU_CONTROLLER_VIEWS_H_
+#endif  // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_MENU_CONTROLLER_VIEWS_H_
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index b164110..1482aa4 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -44,7 +44,7 @@
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
 #include "chrome/browser/ui/view_ids.h"
-#include "chrome/browser/ui/views/bookmark_bar_view.h"
+#include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
 #include "chrome/browser/ui/views/browser_dialogs.h"
 #include "chrome/browser/ui/views/default_search_view.h"
 #include "chrome/browser/ui/views/download_shelf_view.h"
diff --git a/chrome/browser/ui/views/frame/browser_view_layout.cc b/chrome/browser/ui/views/frame/browser_view_layout.cc
index 2429088..872c2e2 100644
--- a/chrome/browser/ui/views/frame/browser_view_layout.cc
+++ b/chrome/browser/ui/views/frame/browser_view_layout.cc
@@ -8,7 +8,7 @@
 #include "chrome/browser/ui/find_bar/find_bar.h"
 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
 #include "chrome/browser/ui/view_ids.h"
-#include "chrome/browser/ui/views/bookmark_bar_view.h"
+#include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
 #include "chrome/browser/ui/views/download_shelf_view.h"
 #include "chrome/browser/ui/views/frame/browser_frame.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
diff --git a/chrome/browser/ui/webui/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp_resource_cache.cc
index 69c5ac0..a0ac138 100644
--- a/chrome/browser/ui/webui/ntp_resource_cache.cc
+++ b/chrome/browser/ui/webui/ntp_resource_cache.cc
@@ -43,7 +43,7 @@
 #include "ui/gfx/color_utils.h"
 
 #if defined(OS_WIN) || defined(TOOLKIT_VIEWS)
-#include "chrome/browser/ui/views/bookmark_bar_view.h"
+#include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
 #elif defined(OS_MACOSX)
 #include "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h"
 #elif defined(OS_POSIX)
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 0ab6f3a..db88990 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2839,20 +2839,20 @@
         'browser/ui/views/autocomplete/touch_autocomplete_popup_contents_view.h',
         'browser/ui/views/autofill_profiles_view_win.cc',
         'browser/ui/views/autofill_profiles_view_win.h',
-        'browser/ui/views/bookmark_bar_instructions_view.cc',
-        'browser/ui/views/bookmark_bar_instructions_view.h',
-        'browser/ui/views/bookmark_bar_view.cc',
-        'browser/ui/views/bookmark_bar_view.h',
-        'browser/ui/views/bookmark_bubble_view.cc',
-        'browser/ui/views/bookmark_bubble_view.h',
-        'browser/ui/views/bookmark_context_menu.cc',
-        'browser/ui/views/bookmark_context_menu.h',
-        'browser/ui/views/bookmark_context_menu_controller_views.cc',
-        'browser/ui/views/bookmark_context_menu_controller_views.h',
-        'browser/ui/views/bookmark_editor_view.cc',
-        'browser/ui/views/bookmark_editor_view.h',
-        'browser/ui/views/bookmark_menu_controller_views.cc',
-        'browser/ui/views/bookmark_menu_controller_views.h',
+        'browser/ui/views/bookmarks/bookmark_bar_instructions_view.cc',
+        'browser/ui/views/bookmarks/bookmark_bar_instructions_view.h',
+        'browser/ui/views/bookmarks/bookmark_bar_view.cc',
+        'browser/ui/views/bookmarks/bookmark_bar_view.h',
+        'browser/ui/views/bookmarks/bookmark_bubble_view.cc',
+        'browser/ui/views/bookmarks/bookmark_bubble_view.h',
+        'browser/ui/views/bookmarks/bookmark_context_menu.cc',
+        'browser/ui/views/bookmarks/bookmark_context_menu.h',
+        'browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc',
+        'browser/ui/views/bookmarks/bookmark_context_menu_controller_views.h',
+        'browser/ui/views/bookmarks/bookmark_editor_view.cc',
+        'browser/ui/views/bookmarks/bookmark_editor_view.h',
+        'browser/ui/views/bookmarks/bookmark_menu_controller_views.cc',
+        'browser/ui/views/bookmarks/bookmark_menu_controller_views.h',
         'browser/ui/views/browser_actions_container.cc',
         'browser/ui/views/browser_actions_container.h',
         'browser/ui/views/browser_bubble.cc',
@@ -3866,17 +3866,17 @@
                 ['include', '^browser/ui/views/autocomplete/autocomplete_result_view_model.h'],
                 ['include', '^browser/ui/views/autocomplete/touch_autocomplete_popup_contents_view.cc'],
                 ['include', '^browser/ui/views/autocomplete/touch_autocomplete_popup_contents_view.h'],
-                ['include', '^browser/ui/views/bookmark_bar_instructions_view.cc'],
-                ['include', '^browser/ui/views/bookmark_bar_instructions_view.h'],
-                ['include', '^browser/ui/views/bookmark_bar_view.cc'],
-                ['include', '^browser/ui/views/bookmark_bar_view.h'],
-                ['include', '^browser/ui/views/bookmark_bubble_view.cc'],
-                ['include', '^browser/ui/views/bookmark_bubble_view.h'],
-                ['include', '^browser/ui/views/bookmark_context_menu.cc'],
-                ['include', '^browser/ui/views/bookmark_context_menu.h'],
-                ['include', '^browser/ui/views/bookmark_context_menu_controller_views.cc'],
-                ['include', '^browser/ui/views/bookmark_context_menu_controller_views.h'],
-                ['include', '^browser/ui/views/bookmark_menu_controller_views.cc'],
+                ['include', '^browser/ui/views/bookmarks/bookmark_bar_instructions_view.cc'],
+                ['include', '^browser/ui/views/bookmarks/bookmark_bar_instructions_view.h'],
+                ['include', '^browser/ui/views/bookmarks/bookmark_bar_view.cc'],
+                ['include', '^browser/ui/views/bookmarks/bookmark_bar_view.h'],
+                ['include', '^browser/ui/views/bookmarks/bookmark_bubble_view.cc'],
+                ['include', '^browser/ui/views/bookmarks/bookmark_bubble_view.h'],
+                ['include', '^browser/ui/views/bookmarks/bookmark_context_menu.cc'],
+                ['include', '^browser/ui/views/bookmarks/bookmark_context_menu.h'],
+                ['include', '^browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc'],
+                ['include', '^browser/ui/views/bookmarks/bookmark_context_menu_controller_views.h'],
+                ['include', '^browser/ui/views/bookmarks/bookmark_menu_controller_views.cc'],
                 ['include', '^browser/ui/views/browser_actions_container.cc'],
                 ['include', '^browser/ui/views/browser_actions_container.h'],
                 ['include', '^browser/ui/views/browser_bubble.cc'],
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 695b9d0..9a7ef72 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -382,7 +382,7 @@
         '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',
+        'browser/ui/views/bookmarks/bookmark_bar_view_test.cc',
         'browser/ui/views/find_bar_host_interactive_uitest.cc',
         'browser/ui/views/tabs/tab_dragging_test.cc',
         'test/interactive_ui/fast_shutdown_interactive_uitest.cc',
@@ -406,7 +406,7 @@
         ['OS=="linux" and toolkit_views==0', {
           'sources!': [
             # TODO(port)
-            'browser/ui/views/bookmark_bar_view_test.cc',
+            'browser/ui/views/bookmarks/bookmark_bar_view_test.cc',
             'browser/ui/views/find_bar_host_interactive_uitest.cc',
             'browser/ui/views/tabs/tab_dragging_test.cc',
             'browser/ui/views/tabs/tab_strip_interactive_uitest.cc',
@@ -433,7 +433,7 @@
             # TODO(port)
             'browser/autocomplete/autocomplete_edit_view_browsertest.cc',
             'browser/debugger/devtools_sanity_unittest.cc',
-            'browser/ui/views/bookmark_bar_view_test.cc',
+            'browser/ui/views/bookmarks/bookmark_bar_view_test.cc',
             'browser/ui/views/find_bar_host_interactive_uitest.cc',
             'browser/ui/views/tabs/tab_dragging_test.cc',
             'browser/ui/views/tabs/tab_strip_interactive_uitest.cc',
@@ -1701,9 +1701,9 @@
         'browser/ui/toolbar/encoding_menu_controller_unittest.cc',
         'browser/ui/toolbar/wrench_menu_model_unittest.cc',
         'browser/ui/views/accessibility_event_router_views_unittest.cc',
-        'browser/ui/views/bookmark_bar_view_unittest.cc',
-        'browser/ui/views/bookmark_context_menu_test.cc',
-        'browser/ui/views/bookmark_editor_view_unittest.cc',
+        'browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc',
+        'browser/ui/views/bookmarks/bookmark_context_menu_test.cc',
+        'browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc',
         'browser/ui/views/extensions/browser_action_drag_data_unittest.cc',
         'browser/ui/views/generic_info_view_unittest.cc',
         'browser/ui/views/info_bubble_unittest.cc',
@@ -2063,7 +2063,7 @@
             'browser/login_prompt_unittest.cc',
             'browser/rlz/rlz_unittest.cc',
             'browser/search_engines/template_url_scraper_unittest.cc',
-            'browser/ui/views/bookmark_editor_view_unittest.cc',
+            'browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc',
             'browser/ui/views/extensions/browser_action_drag_data_unittest.cc',
             'browser/ui/views/find_bar_host_unittest.cc',
             'browser/ui/views/generic_info_view_unittest.cc',