diff options
| -rw-r--r-- | chrome/app/nibs/BookmarkAllTabs.xib | 4 | ||||
| -rw-r--r-- | chrome/app/nibs/BookmarkBar.xib | 14 | ||||
| -rw-r--r-- | chrome/app/nibs/BookmarkBarFolderWindow.xib | 10 | ||||
| -rw-r--r-- | chrome/app/nibs/BookmarkBubble.xib | 2 | ||||
| -rw-r--r-- | chrome/app/nibs/BookmarkEditor.xib | 4 | ||||
| -rw-r--r-- | chrome/app/nibs/BookmarkNameFolder.xib | 2 | ||||
| -rw-r--r-- | chrome/browser/app_controller_mac.mm | 2 | ||||
| -rw-r--r-- | chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.mm | 2 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_all_tabs_controller.h (renamed from chrome/browser/cocoa/bookmark_all_tabs_controller.h) | 8 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_all_tabs_controller.mm (renamed from chrome/browser/cocoa/bookmark_all_tabs_controller.mm) | 3 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm (renamed from chrome/browser/cocoa/bookmark_all_tabs_controller_unittest.mm) | 2 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_bar_bridge.h (renamed from chrome/browser/cocoa/bookmark_bar_bridge.h) | 8 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_bar_bridge.mm (renamed from chrome/browser/cocoa/bookmark_bar_bridge.mm) | 6 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_bar_bridge_unittest.mm (renamed from chrome/browser/cocoa/bookmark_bar_bridge_unittest.mm) | 8 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_bar_constants.h (renamed from chrome/browser/cocoa/bookmark_bar_constants.h) | 6 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_bar_controller.h (renamed from chrome/browser/cocoa/bookmark_bar_controller.h) | 14 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_bar_controller.mm (renamed from chrome/browser/cocoa/bookmark_bar_controller.mm) | 29 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_bar_controller_unittest.mm (renamed from chrome/browser/cocoa/bookmark_bar_controller_unittest.mm) | 16 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_bar_folder_button_cell.h (renamed from chrome/browser/cocoa/bookmark_bar_folder_button_cell.h) | 8 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_bar_folder_button_cell.mm (renamed from chrome/browser/cocoa/bookmark_bar_folder_button_cell.mm) | 2 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_bar_folder_button_cell_unittest.mm (renamed from chrome/browser/cocoa/bookmark_bar_folder_button_cell_unittest.mm) | 2 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_bar_folder_controller.h (renamed from chrome/browser/cocoa/bookmark_bar_folder_controller.h) | 3 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_bar_folder_controller.mm (renamed from chrome/browser/cocoa/bookmark_bar_folder_controller.mm) | 14 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm (renamed from chrome/browser/cocoa/bookmark_bar_folder_controller_unittest.mm) | 10 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_bar_folder_hover_state.h (renamed from chrome/browser/cocoa/bookmark_bar_folder_hover_state.h) | 2 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_bar_folder_hover_state.mm (renamed from chrome/browser/cocoa/bookmark_bar_folder_hover_state.mm) | 4 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_bar_folder_hover_state_unittest.mm (renamed from chrome/browser/cocoa/bookmark_bar_folder_hover_state_unittest.mm) | 4 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_bar_folder_view.h (renamed from chrome/browser/cocoa/bookmark_bar_folder_view.h) | 1 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_bar_folder_view.mm (renamed from chrome/browser/cocoa/bookmark_bar_folder_view.mm) | 7 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_bar_folder_view_unittest.mm (renamed from chrome/browser/cocoa/bookmark_bar_folder_view_unittest.mm) | 8 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_bar_folder_window.h (renamed from chrome/browser/cocoa/bookmark_bar_folder_window.h) | 6 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_bar_folder_window.mm (renamed from chrome/browser/cocoa/bookmark_bar_folder_window.mm) | 4 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_bar_folder_window_unittest.mm (renamed from chrome/browser/cocoa/bookmark_bar_folder_window_unittest.mm) | 2 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_bar_state.h (renamed from chrome/browser/cocoa/bookmark_bar_state.h) | 8 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_bar_toolbar_view.h (renamed from chrome/browser/cocoa/bookmark_bar_toolbar_view.h) | 10 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_bar_toolbar_view.mm (renamed from chrome/browser/cocoa/bookmark_bar_toolbar_view.mm) | 8 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_bar_toolbar_view_unittest.mm (renamed from chrome/browser/cocoa/bookmark_bar_toolbar_view_unittest.mm) | 6 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_bar_unittest_helper.h (renamed from chrome/browser/cocoa/bookmark_bar_unittest_helper.h) | 14 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_bar_unittest_helper.mm (renamed from chrome/browser/cocoa/bookmark_bar_unittest_helper.mm) | 4 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_bar_view.h (renamed from chrome/browser/cocoa/bookmark_bar_view.h) | 8 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_bar_view.mm (renamed from chrome/browser/cocoa/bookmark_bar_view.mm) | 8 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_bar_view_unittest.mm (renamed from chrome/browser/cocoa/bookmark_bar_view_unittest.mm) | 10 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_bubble_controller.h (renamed from chrome/browser/cocoa/bookmark_bubble_controller.h) | 5 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_bubble_controller.mm (renamed from chrome/browser/cocoa/bookmark_bubble_controller.mm) | 4 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm (renamed from chrome/browser/cocoa/bookmark_bubble_controller_unittest.mm) | 2 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_button.h (renamed from chrome/browser/cocoa/bookmark_button.h) | 0 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_button.mm (renamed from chrome/browser/cocoa/bookmark_button.mm) | 5 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_button_cell.h (renamed from chrome/browser/cocoa/bookmark_button_cell.h) | 8 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_button_cell.mm (renamed from chrome/browser/cocoa/bookmark_button_cell.mm) | 6 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_button_cell_unittest.mm (renamed from chrome/browser/cocoa/bookmark_button_cell_unittest.mm) | 4 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_button_unittest.mm (renamed from chrome/browser/cocoa/bookmark_button_unittest.mm) | 4 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_drag_source.h (renamed from chrome/browser/cocoa/bookmark_drag_source.h) | 0 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_drag_source.mm (renamed from chrome/browser/cocoa/bookmark_drag_source.mm) | 2 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_editor_base_controller.h (renamed from chrome/browser/cocoa/bookmark_editor_base_controller.h) | 6 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_editor_base_controller.mm (renamed from chrome/browser/cocoa/bookmark_editor_base_controller.mm) | 9 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm (renamed from chrome/browser/cocoa/bookmark_editor_base_controller_unittest.mm) | 2 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_editor_controller.h (renamed from chrome/browser/cocoa/bookmark_editor_controller.h) | 8 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_editor_controller.mm (renamed from chrome/browser/cocoa/bookmark_editor_controller.mm) | 3 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_editor_controller_unittest.mm (renamed from chrome/browser/cocoa/bookmark_editor_controller_unittest.mm) | 2 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_folder_target.h (renamed from chrome/browser/cocoa/bookmark_folder_target.h) | 6 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_folder_target.mm (renamed from chrome/browser/cocoa/bookmark_folder_target.mm) | 6 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_folder_target_unittest.mm (renamed from chrome/browser/cocoa/bookmark_folder_target_unittest.mm) | 8 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_menu.h (renamed from chrome/browser/cocoa/bookmark_menu.h) | 0 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_menu.mm (renamed from chrome/browser/cocoa/bookmark_menu.mm) | 2 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_menu_bridge.h (renamed from chrome/browser/cocoa/bookmark_menu_bridge.h) | 9 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_menu_bridge.mm (renamed from chrome/browser/cocoa/bookmark_menu_bridge.mm) | 4 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm (renamed from chrome/browser/cocoa/bookmark_menu_bridge_unittest.mm) | 2 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_menu_cocoa_controller.h (renamed from chrome/browser/cocoa/bookmark_menu_cocoa_controller.h) | 8 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm (renamed from chrome/browser/cocoa/bookmark_menu_cocoa_controller.mm) | 4 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_menu_cocoa_controller_unittest.mm (renamed from chrome/browser/cocoa/bookmark_menu_cocoa_controller_unittest.mm) | 2 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_menu_unittest.mm (renamed from chrome/browser/cocoa/bookmark_menu_unittest.mm) | 2 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h (renamed from chrome/browser/cocoa/bookmark_model_observer_for_cocoa.h) | 7 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_model_observer_for_cocoa_unittest.mm (renamed from chrome/browser/cocoa/bookmark_model_observer_for_cocoa_unittest.mm) | 2 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_name_folder_controller.h (renamed from chrome/browser/cocoa/bookmark_name_folder_controller.h) | 8 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_name_folder_controller.mm (renamed from chrome/browser/cocoa/bookmark_name_folder_controller.mm) | 5 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_name_folder_controller_unittest.mm (renamed from chrome/browser/cocoa/bookmark_name_folder_controller_unittest.mm) | 2 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_tree_browser_cell.h (renamed from chrome/browser/cocoa/bookmark_tree_browser_cell.h) | 8 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_tree_browser_cell.mm (renamed from chrome/browser/cocoa/bookmark_tree_browser_cell.mm) | 5 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_tree_browser_cell_unittest.mm (renamed from chrome/browser/cocoa/bookmark_tree_browser_cell_unittest.mm) | 4 | ||||
| -rw-r--r-- | chrome/browser/cocoa/browser_window_controller.h | 4 | ||||
| -rw-r--r-- | chrome/browser/cocoa/browser_window_controller.mm | 4 | ||||
| -rw-r--r-- | chrome/browser/cocoa/draggable_button_unittest.mm | 2 | ||||
| -rw-r--r-- | chrome/browser/cocoa/tabpose_window.mm | 2 | ||||
| -rw-r--r-- | chrome/browser/dom_ui/ntp_resource_cache.cc | 2 | ||||
| -rw-r--r-- | chrome/chrome_browser.gypi | 94 | ||||
| -rw-r--r-- | chrome/chrome_tests.gypi | 48 |
86 files changed, 310 insertions, 303 deletions
diff --git a/chrome/app/nibs/BookmarkAllTabs.xib b/chrome/app/nibs/BookmarkAllTabs.xib index db46a9f..2f7889d 100644 --- a/chrome/app/nibs/BookmarkAllTabs.xib +++ b/chrome/app/nibs/BookmarkAllTabs.xib @@ -939,7 +939,7 @@ <string key="superclassName">BookmarkEditorBaseController</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> - <string key="minorKey">browser/cocoa/bookmark_all_tabs_controller.h</string> + <string key="minorKey">browser/cocoa/bookmarks/bookmark_all_tabs_controller.h</string> </object> </object> <object class="IBPartialClassDescription"> @@ -979,7 +979,7 @@ </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> - <string key="minorKey">browser/cocoa/bookmark_editor_base_controller.h</string> + <string key="minorKey">browser/cocoa/bookmarks/bookmark_editor_base_controller.h</string> </object> </object> <object class="IBPartialClassDescription"> diff --git a/chrome/app/nibs/BookmarkBar.xib b/chrome/app/nibs/BookmarkBar.xib index 5b14e30..e79c2d9 100644 --- a/chrome/app/nibs/BookmarkBar.xib +++ b/chrome/app/nibs/BookmarkBar.xib @@ -1438,14 +1438,14 @@ </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> - <string key="minorKey">browser/cocoa/bookmark_bar_controller.h</string> + <string key="minorKey">browser/cocoa/bookmarks/bookmark_bar_controller.h</string> </object> </object> <object class="IBPartialClassDescription"> <string key="className">BookmarkBarController</string> <object class="IBClassDescriptionSource" key="sourceIdentifier" id="1046231818"> <string key="majorKey">IBProjectSource</string> - <string key="minorKey">browser/cocoa/bookmark_bar_unittest_helper.h</string> + <string key="minorKey">browser/cocoa/bookmarks/bookmark_bar_unittest_helper.h</string> </object> </object> <object class="IBPartialClassDescription"> @@ -1457,7 +1457,7 @@ </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> - <string key="minorKey">browser/cocoa/bookmark_bar_toolbar_view.h</string> + <string key="minorKey">browser/cocoa/bookmarks/bookmark_bar_toolbar_view.h</string> </object> </object> <object class="IBPartialClassDescription"> @@ -1482,7 +1482,7 @@ </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> - <string key="minorKey">browser/cocoa/bookmark_bar_view.h</string> + <string key="minorKey">browser/cocoa/bookmarks/bookmark_bar_view.h</string> </object> </object> <object class="IBPartialClassDescription"> @@ -1506,7 +1506,7 @@ </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> - <string key="minorKey">browser/cocoa/bookmark_button.h</string> + <string key="minorKey">browser/cocoa/bookmarks/bookmark_button.h</string> </object> </object> <object class="IBPartialClassDescription"> @@ -1514,7 +1514,7 @@ <string key="superclassName">GradientButtonCell</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> - <string key="minorKey">browser/cocoa/bookmark_button_cell.h</string> + <string key="minorKey">browser/cocoa/bookmarks/bookmark_button_cell.h</string> </object> </object> <object class="IBPartialClassDescription"> @@ -1522,7 +1522,7 @@ <string key="superclassName">NSMenu</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> - <string key="minorKey">browser/cocoa/bookmark_menu.h</string> + <string key="minorKey">browser/cocoa/bookmarks/bookmark_menu.h</string> </object> </object> <object class="IBPartialClassDescription"> diff --git a/chrome/app/nibs/BookmarkBarFolderWindow.xib b/chrome/app/nibs/BookmarkBarFolderWindow.xib index 84c77ed..1a41cc3 100644 --- a/chrome/app/nibs/BookmarkBarFolderWindow.xib +++ b/chrome/app/nibs/BookmarkBarFolderWindow.xib @@ -1238,14 +1238,14 @@ </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> - <string key="minorKey">browser/cocoa/bookmark_bar_folder_controller.h</string> + <string key="minorKey">browser/cocoa/bookmarks/bookmark_bar_folder_controller.h</string> </object> </object> <object class="IBPartialClassDescription"> <string key="className">BookmarkBarFolderController</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> - <string key="minorKey">browser/cocoa/bookmark_bar_unittest_helper.h</string> + <string key="minorKey">browser/cocoa/bookmarks/bookmark_bar_unittest_helper.h</string> </object> </object> <object class="IBPartialClassDescription"> @@ -1253,7 +1253,7 @@ <string key="superclassName">NSView</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> - <string key="minorKey">browser/cocoa/bookmark_bar_folder_view.h</string> + <string key="minorKey">browser/cocoa/bookmarks/bookmark_bar_folder_view.h</string> </object> </object> <object class="IBPartialClassDescription"> @@ -1261,7 +1261,7 @@ <string key="superclassName">NSWindow</string> <object class="IBClassDescriptionSource" key="sourceIdentifier" id="14500252"> <string key="majorKey">IBProjectSource</string> - <string key="minorKey">browser/cocoa/bookmark_bar_folder_window.h</string> + <string key="minorKey">browser/cocoa/bookmarks/bookmark_bar_folder_window.h</string> </object> </object> <object class="IBPartialClassDescription"> @@ -1279,7 +1279,7 @@ <string key="superclassName">NSMenu</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> - <string key="minorKey">browser/cocoa/bookmark_menu.h</string> + <string key="minorKey">browser/cocoa/bookmarks/bookmark_menu.h</string> </object> </object> <object class="IBPartialClassDescription"> diff --git a/chrome/app/nibs/BookmarkBubble.xib b/chrome/app/nibs/BookmarkBubble.xib index 472d8ce..f656b7d 100644 --- a/chrome/app/nibs/BookmarkBubble.xib +++ b/chrome/app/nibs/BookmarkBubble.xib @@ -889,7 +889,7 @@ </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> - <string key="minorKey">browser/cocoa/bookmark_bubble_controller.h</string> + <string key="minorKey">browser/cocoa/bookmarks/bookmark_bubble_controller.h</string> </object> </object> <object class="IBPartialClassDescription"> diff --git a/chrome/app/nibs/BookmarkEditor.xib b/chrome/app/nibs/BookmarkEditor.xib index 09d969c..3d34906 100644 --- a/chrome/app/nibs/BookmarkEditor.xib +++ b/chrome/app/nibs/BookmarkEditor.xib @@ -1094,7 +1094,7 @@ </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> - <string key="minorKey">browser/cocoa/bookmark_editor_base_controller.h</string> + <string key="minorKey">browser/cocoa/bookmarks/bookmark_editor_base_controller.h</string> </object> </object> <object class="IBPartialClassDescription"> @@ -1106,7 +1106,7 @@ </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> - <string key="minorKey">browser/cocoa/bookmark_editor_controller.h</string> + <string key="minorKey">browser/cocoa/bookmarks/bookmark_editor_controller.h</string> </object> </object> <object class="IBPartialClassDescription"> diff --git a/chrome/app/nibs/BookmarkNameFolder.xib b/chrome/app/nibs/BookmarkNameFolder.xib index 2a5655c..a641242 100644 --- a/chrome/app/nibs/BookmarkNameFolder.xib +++ b/chrome/app/nibs/BookmarkNameFolder.xib @@ -514,7 +514,7 @@ </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> - <string key="minorKey">browser/cocoa/bookmark_name_folder_controller.h</string> + <string key="minorKey">browser/cocoa/bookmarks/bookmark_name_folder_controller.h</string> </object> </object> <object class="IBPartialClassDescription"> diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm index d1dd836..8ce821d 100644 --- a/chrome/browser/app_controller_mac.mm +++ b/chrome/browser/app_controller_mac.mm @@ -22,7 +22,7 @@ #include "chrome/browser/browser_thread.h" #include "chrome/browser/browser_window.h" #import "chrome/browser/cocoa/about_window_controller.h" -#import "chrome/browser/cocoa/bookmark_menu_bridge.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_menu_bridge.h" #import "chrome/browser/cocoa/browser_window_cocoa.h" #import "chrome/browser/cocoa/browser_window_controller.h" #import "chrome/browser/cocoa/bug_report_window_controller.h" diff --git a/chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.mm b/chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.mm index 6d692f6..52c4af1 100644 --- a/chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.mm +++ b/chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.mm @@ -8,7 +8,7 @@ #include "base/sys_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" -#include "chrome/browser/cocoa/bookmark_drag_source.h" +#include "chrome/browser/cocoa/bookmarks/bookmark_drag_source.h" #include "chrome/browser/tab_contents/tab_contents_view_mac.h" NSString* const kBookmarkDictionaryListPboardType = diff --git a/chrome/browser/cocoa/bookmark_all_tabs_controller.h b/chrome/browser/cocoa/bookmarks/bookmark_all_tabs_controller.h index 4b34467..4c6a57c 100644 --- a/chrome/browser/cocoa/bookmark_all_tabs_controller.h +++ b/chrome/browser/cocoa/bookmarks/bookmark_all_tabs_controller.h @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_COCOA_BOOKMARK_ALL_TABS_CONTROLLER_H_ -#define CHROME_BROWSER_COCOA_BOOKMARK_ALL_TABS_CONTROLLER_H_ +#ifndef CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_ALL_TABS_CONTROLLER_H_ +#define CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_ALL_TABS_CONTROLLER_H_ #pragma once #include <utility> #include <vector> #include "base/string16.h" -#import "chrome/browser/cocoa/bookmark_editor_base_controller.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_editor_base_controller.h" // A list of pairs containing the name and URL associated with each // currently active tab in the active browser window. @@ -43,4 +43,4 @@ typedef std::vector<ActiveTabNameURLPair> ActiveTabsNameURLPairVector; @end -#endif // CHROME_BROWSER_COCOA_BOOKMARK_ALL_TABS_CONTROLLER_H_ +#endif // CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_ALL_TABS_CONTROLLER_H_ diff --git a/chrome/browser/cocoa/bookmark_all_tabs_controller.mm b/chrome/browser/cocoa/bookmarks/bookmark_all_tabs_controller.mm index b47f92a..0c4be7c 100644 --- a/chrome/browser/cocoa/bookmark_all_tabs_controller.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_all_tabs_controller.mm @@ -2,7 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "chrome/browser/cocoa/bookmark_all_tabs_controller.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_all_tabs_controller.h" + #include "app/l10n_util_mac.h" #include "base/string16.h" #include "base/sys_string_conversions.h" diff --git a/chrome/browser/cocoa/bookmark_all_tabs_controller_unittest.mm b/chrome/browser/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm index 7f9878d..2fb42f0 100644 --- a/chrome/browser/cocoa/bookmark_all_tabs_controller_unittest.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm @@ -8,7 +8,7 @@ #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" -#import "chrome/browser/cocoa/bookmark_all_tabs_controller.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_all_tabs_controller.h" #include "chrome/browser/cocoa/browser_test_helper.h" #import "chrome/browser/cocoa/cocoa_test_helper.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/cocoa/bookmark_bar_bridge.h b/chrome/browser/cocoa/bookmarks/bookmark_bar_bridge.h index 78461e3..a0bc1a7 100644 --- a/chrome/browser/cocoa/bookmark_bar_bridge.h +++ b/chrome/browser/cocoa/bookmarks/bookmark_bar_bridge.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. @@ -8,8 +8,8 @@ // There is exactly one BookmarkBarBridge per BookmarkBarController / // BrowserWindowController / Browser. -#ifndef CHROME_BROWSER_COCOA_BOOKMARK_BAR_BRIDGE_H_ -#define CHROME_BROWSER_COCOA_BOOKMARK_BAR_BRIDGE_H_ +#ifndef CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_BAR_BRIDGE_H_ +#define CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_BAR_BRIDGE_H_ #pragma once #include "base/basictypes.h" @@ -57,4 +57,4 @@ class BookmarkBarBridge : public BookmarkModelObserver { DISALLOW_COPY_AND_ASSIGN(BookmarkBarBridge); }; -#endif // CHROME_BROWSER_COCOA_BOOKMARK_BAR_BRIDGE_H_ +#endif // CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_BAR_BRIDGE_H_ diff --git a/chrome/browser/cocoa/bookmark_bar_bridge.mm b/chrome/browser/cocoa/bookmarks/bookmark_bar_bridge.mm index 354897f..dc38b91 100644 --- a/chrome/browser/cocoa/bookmark_bar_bridge.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_bar_bridge.mm @@ -1,11 +1,11 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. -#include "chrome/browser/cocoa/bookmark_bar_bridge.h" +#include "chrome/browser/cocoa/bookmarks/bookmark_bar_bridge.h" #include "chrome/browser/bookmarks/bookmark_model.h" -#include "chrome/browser/cocoa/bookmark_bar_controller.h" +#include "chrome/browser/cocoa/bookmarks/bookmark_bar_controller.h" BookmarkBarBridge::BookmarkBarBridge(BookmarkBarController* controller, BookmarkModel* model) diff --git a/chrome/browser/cocoa/bookmark_bar_bridge_unittest.mm b/chrome/browser/cocoa/bookmarks/bookmark_bar_bridge_unittest.mm index 4588fc7..567761e 100644 --- a/chrome/browser/cocoa/bookmark_bar_bridge_unittest.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_bar_bridge_unittest.mm @@ -1,16 +1,16 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. -#include "chrome/browser/cocoa/bookmark_bar_bridge.h" -#include "chrome/browser/cocoa/bookmark_bar_controller.h" +#include "chrome/browser/cocoa/bookmarks/bookmark_bar_bridge.h" +#include "chrome/browser/cocoa/bookmarks/bookmark_bar_controller.h" #include "chrome/browser/cocoa/browser_test_helper.h" #include "chrome/browser/cocoa/cocoa_test_helper.h" #include "testing/gtest/include/gtest/gtest.h" #import "testing/gtest_mac.h" #include "testing/platform_test.h" -// TODO(jrg): add OCMock to Chromium to save some typing. +// TODO(jrg): use OCMock. namespace { diff --git a/chrome/browser/cocoa/bookmark_bar_constants.h b/chrome/browser/cocoa/bookmarks/bookmark_bar_constants.h index bb2a8f6..d1be28f 100644 --- a/chrome/browser/cocoa/bookmark_bar_constants.h +++ b/chrome/browser/cocoa/bookmarks/bookmark_bar_constants.h @@ -6,8 +6,8 @@ // different file because they're conditionally included in cross platform code // and thus no Objective-C++ stuff. -#ifndef CHROME_BROWSER_COCOA_BOOKMARK_BAR_CONSTANTS_H_ -#define CHROME_BROWSER_COCOA_BOOKMARK_BAR_CONSTANTS_H_ +#ifndef CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_BAR_CONSTANTS_H_ +#define CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_BAR_CONSTANTS_H_ #pragma once namespace bookmarks { @@ -35,4 +35,4 @@ const int kBookmarkButtonHeight = kBookmarkBarHeight + kVisualHeightOffset; } // namespace bookmarks -#endif // CHROME_BROWSER_COCOA_BOOKMARK_BAR_CONSTANTS_H_ +#endif // CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_BAR_CONSTANTS_H_ diff --git a/chrome/browser/cocoa/bookmark_bar_controller.h b/chrome/browser/cocoa/bookmarks/bookmark_bar_controller.h index 332a0ae..70f2ea6 100644 --- a/chrome/browser/cocoa/bookmark_bar_controller.h +++ b/chrome/browser/cocoa/bookmarks/bookmark_bar_controller.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_COCOA_BOOKMARK_BAR_CONTROLLER_H_ -#define CHROME_BROWSER_COCOA_BOOKMARK_BAR_CONTROLLER_H_ +#ifndef CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_BAR_CONTROLLER_H_ +#define CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_BAR_CONTROLLER_H_ #pragma once #import <Cocoa/Cocoa.h> @@ -12,10 +12,10 @@ #import "base/chrome_application_mac.h" #include "base/scoped_nsobject.h" #include "base/scoped_ptr.h" -#include "chrome/browser/cocoa/bookmark_bar_bridge.h" -#import "chrome/browser/cocoa/bookmark_bar_state.h" -#import "chrome/browser/cocoa/bookmark_bar_toolbar_view.h" -#import "chrome/browser/cocoa/bookmark_button.h" +#include "chrome/browser/cocoa/bookmarks/bookmark_bar_bridge.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_state.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_toolbar_view.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_button.h" #include "chrome/browser/cocoa/tab_strip_model_observer_bridge.h" #include "webkit/glue/window_open_disposition.h" @@ -376,4 +376,4 @@ willAnimateFromState:(bookmarks::VisualState)oldState - (void)setIgnoreAnimations:(BOOL)ignore; @end -#endif // CHROME_BROWSER_COCOA_BOOKMARK_BAR_CONTROLLER_H_ +#endif // CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_BAR_CONTROLLER_H_ diff --git a/chrome/browser/cocoa/bookmark_bar_controller.mm b/chrome/browser/cocoa/bookmarks/bookmark_bar_controller.mm index 6ccd73c..402102e 100644 --- a/chrome/browser/cocoa/bookmark_bar_controller.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_bar_controller.mm @@ -2,7 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "chrome/browser/cocoa/bookmark_bar_controller.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_controller.h" + #include "app/l10n_util_mac.h" #include "app/resource_bundle.h" #include "base/mac_util.h" @@ -13,19 +14,19 @@ #include "chrome/browser/browser.h" #include "chrome/browser/browser_list.h" #import "chrome/browser/cocoa/background_gradient_view.h" -#import "chrome/browser/cocoa/bookmark_bar_bridge.h" -#import "chrome/browser/cocoa/bookmark_bar_constants.h" -#import "chrome/browser/cocoa/bookmark_bar_folder_controller.h" -#import "chrome/browser/cocoa/bookmark_bar_folder_window.h" -#import "chrome/browser/cocoa/bookmark_bar_toolbar_view.h" -#import "chrome/browser/cocoa/bookmark_bar_view.h" -#import "chrome/browser/cocoa/bookmark_button.h" -#import "chrome/browser/cocoa/bookmark_button_cell.h" -#import "chrome/browser/cocoa/bookmark_editor_controller.h" -#import "chrome/browser/cocoa/bookmark_folder_target.h" -#import "chrome/browser/cocoa/bookmark_menu.h" -#import "chrome/browser/cocoa/bookmark_menu_cocoa_controller.h" -#import "chrome/browser/cocoa/bookmark_name_folder_controller.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_bridge.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_constants.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_folder_controller.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_folder_window.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_toolbar_view.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_view.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_button.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_button_cell.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_editor_controller.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_folder_target.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_menu.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_menu_cocoa_controller.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_name_folder_controller.h" #import "chrome/browser/cocoa/browser_window_controller.h" #import "chrome/browser/cocoa/event_utils.h" #import "chrome/browser/cocoa/fullscreen_controller.h" diff --git a/chrome/browser/cocoa/bookmark_bar_controller_unittest.mm b/chrome/browser/cocoa/bookmarks/bookmark_bar_controller_unittest.mm index ece4018..9abdb0a 100644 --- a/chrome/browser/cocoa/bookmark_bar_controller_unittest.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_bar_controller_unittest.mm @@ -12,14 +12,14 @@ #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" -#import "chrome/browser/cocoa/bookmark_bar_constants.h" -#import "chrome/browser/cocoa/bookmark_bar_controller.h" -#import "chrome/browser/cocoa/bookmark_bar_folder_window.h" -#import "chrome/browser/cocoa/bookmark_bar_unittest_helper.h" -#import "chrome/browser/cocoa/bookmark_bar_view.h" -#import "chrome/browser/cocoa/bookmark_button.h" -#import "chrome/browser/cocoa/bookmark_button_cell.h" -#import "chrome/browser/cocoa/bookmark_menu.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_constants.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_controller.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_folder_window.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_unittest_helper.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_view.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_button.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_button_cell.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_menu.h" #include "chrome/browser/cocoa/browser_test_helper.h" #import "chrome/browser/cocoa/cocoa_test_helper.h" #include "chrome/browser/cocoa/test_event_utils.h" diff --git a/chrome/browser/cocoa/bookmark_bar_folder_button_cell.h b/chrome/browser/cocoa/bookmarks/bookmark_bar_folder_button_cell.h index f1a2ae7..c8eaf71 100644 --- a/chrome/browser/cocoa/bookmark_bar_folder_button_cell.h +++ b/chrome/browser/cocoa/bookmarks/bookmark_bar_folder_button_cell.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_COCOA_BOOKMARK_BAR_FOLDER_BUTTON_CELL_H_ -#define CHROME_BROWSER_COCOA_BOOKMARK_BAR_FOLDER_BUTTON_CELL_H_ +#ifndef CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_BAR_FOLDER_BUTTON_CELL_H_ +#define CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_BAR_FOLDER_BUTTON_CELL_H_ #pragma once -#import "chrome/browser/cocoa/bookmark_button_cell.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_button_cell.h" class BookmarkNode; @@ -28,4 +28,4 @@ class BookmarkNode; @end -#endif // CHROME_BROWSER_COCOA_BOOKMARK_BAR_FOLDER_BUTTON_CELL_H_ +#endif // CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_BAR_FOLDER_BUTTON_CELL_H_ diff --git a/chrome/browser/cocoa/bookmark_bar_folder_button_cell.mm b/chrome/browser/cocoa/bookmarks/bookmark_bar_folder_button_cell.mm index 3c4b913..a3a73a3 100644 --- a/chrome/browser/cocoa/bookmark_bar_folder_button_cell.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_bar_folder_button_cell.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "chrome/browser/cocoa/bookmark_bar_folder_button_cell.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_folder_button_cell.h" @implementation BookmarkBarFolderButtonCell diff --git a/chrome/browser/cocoa/bookmark_bar_folder_button_cell_unittest.mm b/chrome/browser/cocoa/bookmarks/bookmark_bar_folder_button_cell_unittest.mm index 55c2412..0fb8ae3 100644 --- a/chrome/browser/cocoa/bookmark_bar_folder_button_cell_unittest.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_bar_folder_button_cell_unittest.mm @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/scoped_nsobject.h" -#import "chrome/browser/cocoa/bookmark_bar_folder_button_cell.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_folder_button_cell.h" #import "chrome/browser/cocoa/cocoa_test_helper.h" namespace { diff --git a/chrome/browser/cocoa/bookmark_bar_folder_controller.h b/chrome/browser/cocoa/bookmarks/bookmark_bar_folder_controller.h index e03d06f..1511f11 100644 --- a/chrome/browser/cocoa/bookmark_bar_folder_controller.h +++ b/chrome/browser/cocoa/bookmarks/bookmark_bar_folder_controller.h @@ -5,7 +5,7 @@ #import <Cocoa/Cocoa.h> #include "base/scoped_nsobject.h" -#import "chrome/browser/cocoa/bookmark_button.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_button.h" @class BookmarkBarController; @class BookmarkBarFolderView; @@ -180,4 +180,3 @@ - (BookmarkButton*)buttonForDroppingOnAtPoint:(NSPoint)point; @end - diff --git a/chrome/browser/cocoa/bookmark_bar_folder_controller.mm b/chrome/browser/cocoa/bookmarks/bookmark_bar_folder_controller.mm index f932c6d..ca1514c 100644 --- a/chrome/browser/cocoa/bookmark_bar_folder_controller.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_bar_folder_controller.mm @@ -2,19 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "chrome/browser/cocoa/bookmark_bar_folder_controller.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_folder_controller.h" #include "base/mac_util.h" #include "base/nsimage_cache_mac.h" #include "base/sys_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_utils.h" -#import "chrome/browser/cocoa/bookmark_bar_constants.h" // namespace bookmarks -#import "chrome/browser/cocoa/bookmark_bar_controller.h" // namespace bookmarks -#import "chrome/browser/cocoa/bookmark_bar_folder_button_cell.h" -#import "chrome/browser/cocoa/bookmark_bar_folder_hover_state.h" -#import "chrome/browser/cocoa/bookmark_bar_folder_view.h" -#import "chrome/browser/cocoa/bookmark_folder_target.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_constants.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_controller.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_folder_button_cell.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_folder_hover_state.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_folder_view.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_folder_target.h" #import "chrome/browser/cocoa/browser_window_controller.h" #import "chrome/browser/cocoa/event_utils.h" #import "chrome/browser/themes/browser_theme_provider.h" diff --git a/chrome/browser/cocoa/bookmark_bar_folder_controller_unittest.mm b/chrome/browser/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm index e6e3701..293aff1 100644 --- a/chrome/browser/cocoa/bookmark_bar_folder_controller_unittest.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm @@ -8,11 +8,11 @@ #include "base/scoped_nsobject.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" -#import "chrome/browser/cocoa/bookmark_bar_constants.h" // namespace bookmarks -#import "chrome/browser/cocoa/bookmark_bar_controller.h" -#import "chrome/browser/cocoa/bookmark_bar_folder_button_cell.h" -#import "chrome/browser/cocoa/bookmark_bar_folder_controller.h" -#import "chrome/browser/cocoa/bookmark_bar_unittest_helper.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_constants.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_controller.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_folder_button_cell.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_folder_controller.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_unittest_helper.h" #include "chrome/browser/cocoa/browser_test_helper.h" #import "chrome/browser/cocoa/cocoa_test_helper.h" #import "chrome/browser/cocoa/view_resizer_pong.h" diff --git a/chrome/browser/cocoa/bookmark_bar_folder_hover_state.h b/chrome/browser/cocoa/bookmarks/bookmark_bar_folder_hover_state.h index 1c103d6..21d0658 100644 --- a/chrome/browser/cocoa/bookmark_bar_folder_hover_state.h +++ b/chrome/browser/cocoa/bookmarks/bookmark_bar_folder_hover_state.h @@ -5,7 +5,7 @@ #import <Cocoa/Cocoa.h> #include "base/scoped_nsobject.h" -#import "chrome/browser/cocoa/bookmark_button.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_button.h" // Hover state machine. Encapsulates the hover state for // BookmarkBarFolderController. diff --git a/chrome/browser/cocoa/bookmark_bar_folder_hover_state.mm b/chrome/browser/cocoa/bookmarks/bookmark_bar_folder_hover_state.mm index 86d78bb..2c6feee 100644 --- a/chrome/browser/cocoa/bookmark_bar_folder_hover_state.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_bar_folder_hover_state.mm @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "chrome/browser/cocoa/bookmark_bar_folder_hover_state.h" -#import "chrome/browser/cocoa/bookmark_bar_controller.h" // namespace bookmarks +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_folder_hover_state.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_controller.h" @interface BookmarkBarFolderHoverState(Private) - (void)setHoverState:(HoverState)state; diff --git a/chrome/browser/cocoa/bookmark_bar_folder_hover_state_unittest.mm b/chrome/browser/cocoa/bookmarks/bookmark_bar_folder_hover_state_unittest.mm index 3a84a11..bcd1293 100644 --- a/chrome/browser/cocoa/bookmark_bar_folder_hover_state_unittest.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_bar_folder_hover_state_unittest.mm @@ -5,8 +5,8 @@ #import <Cocoa/Cocoa.h> #include "base/message_loop.h" -#import "chrome/browser/cocoa/bookmark_bar_controller.h" -#import "chrome/browser/cocoa/bookmark_bar_folder_hover_state.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_controller.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_folder_hover_state.h" #import "chrome/browser/cocoa/browser_test_helper.h" #import "chrome/browser/cocoa/cocoa_test_helper.h" diff --git a/chrome/browser/cocoa/bookmark_bar_folder_view.h b/chrome/browser/cocoa/bookmarks/bookmark_bar_folder_view.h index 5b48fcf..8f60b8e 100644 --- a/chrome/browser/cocoa/bookmark_bar_folder_view.h +++ b/chrome/browser/cocoa/bookmarks/bookmark_bar_folder_view.h @@ -27,4 +27,3 @@ @property (readonly) CGFloat dropIndicatorPosition; - (void)setController:(id)controller; @end - diff --git a/chrome/browser/cocoa/bookmark_bar_folder_view.mm b/chrome/browser/cocoa/bookmarks/bookmark_bar_folder_view.mm index 89d9d2a..7cf18af 100644 --- a/chrome/browser/cocoa/bookmark_bar_folder_view.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_bar_folder_view.mm @@ -2,10 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "chrome/browser/cocoa/bookmark_bar_folder_view.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_folder_view.h" + #include "chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.h" -#import "chrome/browser/cocoa/bookmark_bar_controller.h" -#import "chrome/browser/cocoa/bookmark_folder_target.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_controller.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_folder_target.h" #include "chrome/browser/metrics/user_metrics.h" #import "third_party/mozilla/NSPasteboard+Utils.h" diff --git a/chrome/browser/cocoa/bookmark_bar_folder_view_unittest.mm b/chrome/browser/cocoa/bookmarks/bookmark_bar_folder_view_unittest.mm index 15046a3..9abe55a 100644 --- a/chrome/browser/cocoa/bookmark_bar_folder_view_unittest.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_bar_folder_view_unittest.mm @@ -3,10 +3,10 @@ // found in the LICENSE file. #include "base/scoped_nsobject.h" -#import "chrome/browser/cocoa/bookmark_bar_controller.h" -#import "chrome/browser/cocoa/bookmark_bar_folder_view.h" -#import "chrome/browser/cocoa/bookmark_button.h" -#import "chrome/browser/cocoa/bookmark_folder_target.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_controller.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_folder_view.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_button.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_folder_target.h" #import "chrome/browser/cocoa/cocoa_test_helper.h" #import "chrome/browser/cocoa/url_drop_target.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/cocoa/bookmark_bar_folder_window.h b/chrome/browser/cocoa/bookmarks/bookmark_bar_folder_window.h index 99997d7..4b85277 100644 --- a/chrome/browser/cocoa/bookmark_bar_folder_window.h +++ b/chrome/browser/cocoa/bookmarks/bookmark_bar_folder_window.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_COCOA_BOOKMARK_BAR_FOLDER_WINDOW_H_ -#define CHROME_BROWSER_COCOA_BOOKMARK_BAR_FOLDER_WINDOW_H_ +#ifndef CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_BAR_FOLDER_WINDOW_H_ +#define CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_BAR_FOLDER_WINDOW_H_ #pragma once #import <Cocoa/Cocoa.h> @@ -31,4 +31,4 @@ @end -#endif // CHROME_BROWSER_COCOA_BOOKMARK_BAR_FOLDER_WINDOW_H_ +#endif // CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_BAR_FOLDER_WINDOW_H_ diff --git a/chrome/browser/cocoa/bookmark_bar_folder_window.mm b/chrome/browser/cocoa/bookmarks/bookmark_bar_folder_window.mm index 1d0e863..5e51a81 100644 --- a/chrome/browser/cocoa/bookmark_bar_folder_window.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_bar_folder_window.mm @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "chrome/browser/cocoa/bookmark_bar_folder_window.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_folder_window.h" #import "base/logging.h" #include "base/nsimage_cache_mac.h" #import "base/scoped_nsobject.h" -#import "chrome/browser/cocoa/bookmark_bar_folder_controller.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_folder_controller.h" #import "chrome/browser/cocoa/image_utils.h" #import "third_party/GTM/AppKit/GTMNSColor+Luminance.h" #import "third_party/GTM/AppKit/GTMNSBezierPath+RoundRect.h" diff --git a/chrome/browser/cocoa/bookmark_bar_folder_window_unittest.mm b/chrome/browser/cocoa/bookmarks/bookmark_bar_folder_window_unittest.mm index 269aa3d..d291390 100644 --- a/chrome/browser/cocoa/bookmark_bar_folder_window_unittest.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_bar_folder_window_unittest.mm @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/scoped_ptr.h" -#include "chrome/browser/cocoa/bookmark_bar_folder_window.h" +#include "chrome/browser/cocoa/bookmarks/bookmark_bar_folder_window.h" #include "chrome/browser/cocoa/cocoa_test_helper.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" diff --git a/chrome/browser/cocoa/bookmark_bar_state.h b/chrome/browser/cocoa/bookmarks/bookmark_bar_state.h index 718f111..4f98b5c 100644 --- a/chrome/browser/cocoa/bookmark_bar_state.h +++ b/chrome/browser/cocoa/bookmarks/bookmark_bar_state.h @@ -1,9 +1,9 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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_COCOA_BOOKMARK_BAR_STATE_H_ -#define CHROME_BROWSER_COCOA_BOOKMARK_BAR_STATE_H_ +#ifndef CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_BAR_STATE_H_ +#define CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_BAR_STATE_H_ #pragma once #import <Cocoa/Cocoa.h> @@ -59,4 +59,4 @@ enum VisualState { @end -#endif // CHROME_BROWSER_COCOA_BOOKMARK_BAR_STATE_H_ +#endif // CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_BAR_STATE_H_ diff --git a/chrome/browser/cocoa/bookmark_bar_toolbar_view.h b/chrome/browser/cocoa/bookmarks/bookmark_bar_toolbar_view.h index 5a866e4..cdc6e9c 100644 --- a/chrome/browser/cocoa/bookmark_bar_toolbar_view.h +++ b/chrome/browser/cocoa/bookmarks/bookmark_bar_toolbar_view.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. @@ -7,14 +7,14 @@ // attached (slimline with a stroke at the bottom edge) or New Tab Page style // (padded with a round rect border and the New Tab Page theme behind). -#ifndef CHROME_BROWSER_COCOA_BOOKMARK_BAR_TOOLBAR_VIEW_H_ -#define CHROME_BROWSER_COCOA_BOOKMARK_BAR_TOOLBAR_VIEW_H_ +#ifndef CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_BAR_TOOLBAR_VIEW_H_ +#define CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_BAR_TOOLBAR_VIEW_H_ #pragma once #import <Cocoa/Cocoa.h> #import "chrome/browser/cocoa/animatable_view.h" -#import "chrome/browser/cocoa/bookmark_bar_state.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_state.h" @class BookmarkBarView; class TabContents; @@ -41,4 +41,4 @@ class ThemeProvider; } @end -#endif // CHROME_BROWSER_COCOA_BOOKMARK_BAR_TOOLBAR_VIEW_H_ +#endif // CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_BAR_TOOLBAR_VIEW_H_ diff --git a/chrome/browser/cocoa/bookmark_bar_toolbar_view.mm b/chrome/browser/cocoa/bookmarks/bookmark_bar_toolbar_view.mm index f2c8494..6abf516 100644 --- a/chrome/browser/cocoa/bookmark_bar_toolbar_view.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_bar_toolbar_view.mm @@ -1,13 +1,13 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. -#import "chrome/browser/cocoa/bookmark_bar_toolbar_view.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_toolbar_view.h" #include "app/theme_provider.h" #include "gfx/rect.h" -#import "chrome/browser/cocoa/bookmark_bar_constants.h" -#import "chrome/browser/cocoa/bookmark_bar_controller.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_constants.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_controller.h" #import "chrome/browser/cocoa/browser_window_controller.h" #import "chrome/browser/cocoa/themed_window.h" #include "chrome/browser/ntp_background_util.h" diff --git a/chrome/browser/cocoa/bookmark_bar_toolbar_view_unittest.mm b/chrome/browser/cocoa/bookmarks/bookmark_bar_toolbar_view_unittest.mm index 0b5a1cc..aecdf84 100644 --- a/chrome/browser/cocoa/bookmark_bar_toolbar_view_unittest.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_bar_toolbar_view_unittest.mm @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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,8 +6,8 @@ #include "app/theme_provider.h" #include "base/scoped_nsobject.h" -#import "chrome/browser/cocoa/bookmark_bar_controller.h" -#import "chrome/browser/cocoa/bookmark_bar_toolbar_view.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_controller.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_toolbar_view.h" #import "chrome/browser/cocoa/cocoa_test_helper.h" #include "chrome/browser/themes/browser_theme_provider.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/cocoa/bookmark_bar_unittest_helper.h b/chrome/browser/cocoa/bookmarks/bookmark_bar_unittest_helper.h index d62e962..edd60d2 100644 --- a/chrome/browser/cocoa/bookmark_bar_unittest_helper.h +++ b/chrome/browser/cocoa/bookmarks/bookmark_bar_unittest_helper.h @@ -1,16 +1,16 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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_COCOA_AUTOCOMPLETE_BOOKMARK_BAR_UNITTEST_HELPER_H_ -#define CHROME_BROWSER_COCOA_AUTOCOMPLETE_BOOKMARK_BAR_UNITTEST_HELPER_H_ +#ifndef CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_BAR_UNITTEST_HELPER_H_ +#define CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_BAR_UNITTEST_HELPER_H_ #pragma once #import <Foundation/Foundation.h> -#import "chrome/browser/cocoa/bookmark_bar_controller.h" -#import "chrome/browser/cocoa/bookmark_bar_folder_controller.h" -#import "chrome/browser/cocoa/bookmark_button.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_controller.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_folder_controller.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_button.h" @interface BookmarkBarController (BookmarkBarUnitTestHelper) @@ -54,4 +54,4 @@ @end -#endif // CHROME_BROWSER_COCOA_AUTOCOMPLETE_TEXT_FIELD_UNITTEST_HELPER_H_ +#endif // CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_BAR_UNITTEST_HELPER_H_ diff --git a/chrome/browser/cocoa/bookmark_bar_unittest_helper.mm b/chrome/browser/cocoa/bookmarks/bookmark_bar_unittest_helper.mm index 5453057..c8eefdb 100644 --- a/chrome/browser/cocoa/bookmark_bar_unittest_helper.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_bar_unittest_helper.mm @@ -1,8 +1,8 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. -#import "chrome/browser/cocoa/bookmark_bar_unittest_helper.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_unittest_helper.h" @interface NSArray (BookmarkBarUnitTestHelper) diff --git a/chrome/browser/cocoa/bookmark_bar_view.h b/chrome/browser/cocoa/bookmarks/bookmark_bar_view.h index f8439fa..a409171 100644 --- a/chrome/browser/cocoa/bookmark_bar_view.h +++ b/chrome/browser/cocoa/bookmarks/bookmark_bar_view.h @@ -1,12 +1,12 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. // // A simple custom NSView for the bookmark bar used to prevent clicking and // dragging from moving the browser window. -#ifndef CHROME_BROWSER_COCOA_BOOKMARK_BAR_VIEW_H_ -#define CHROME_BROWSER_COCOA_BOOKMARK_BAR_VIEW_H_ +#ifndef CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_BAR_VIEW_H_ +#define CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_BAR_VIEW_H_ #pragma once #import <Cocoa/Cocoa.h> @@ -38,4 +38,4 @@ - (void)setController:(id)controller; @end -#endif // CHROME_BROWSER_COCOA_BOOKMARK_BAR_VIEW_H_ +#endif // CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_BAR_VIEW_H_ diff --git a/chrome/browser/cocoa/bookmark_bar_view.mm b/chrome/browser/cocoa/bookmarks/bookmark_bar_view.mm index ffc8441..667cff1 100644 --- a/chrome/browser/cocoa/bookmark_bar_view.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_bar_view.mm @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "chrome/browser/cocoa/bookmark_bar_view.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_view.h" #include "chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.h" -#import "chrome/browser/cocoa/bookmark_bar_controller.h" -#import "chrome/browser/cocoa/bookmark_button.h" -#import "chrome/browser/cocoa/bookmark_folder_target.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_controller.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_button.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_folder_target.h" #import "chrome/browser/cocoa/themed_window.h" #import "chrome/browser/cocoa/view_id_util.h" #include "chrome/browser/metrics/user_metrics.h" diff --git a/chrome/browser/cocoa/bookmark_bar_view_unittest.mm b/chrome/browser/cocoa/bookmarks/bookmark_bar_view_unittest.mm index 710a9b9..3d7725d 100644 --- a/chrome/browser/cocoa/bookmark_bar_view_unittest.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_bar_view_unittest.mm @@ -1,12 +1,12 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. #include "base/scoped_nsobject.h" -#import "chrome/browser/cocoa/bookmark_bar_controller.h" -#import "chrome/browser/cocoa/bookmark_bar_view.h" -#import "chrome/browser/cocoa/bookmark_button.h" -#import "chrome/browser/cocoa/bookmark_folder_target.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_controller.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_view.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_button.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_folder_target.h" #import "chrome/browser/cocoa/cocoa_test_helper.h" #import "chrome/browser/cocoa/url_drop_target.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/cocoa/bookmark_bubble_controller.h b/chrome/browser/cocoa/bookmarks/bookmark_bubble_controller.h index 8ff05da..9ceee17 100644 --- a/chrome/browser/cocoa/bookmark_bubble_controller.h +++ b/chrome/browser/cocoa/bookmarks/bookmark_bubble_controller.h @@ -1,11 +1,12 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. #import <Cocoa/Cocoa.h> + #import "base/cocoa_protocols_mac.h" #include "base/scoped_ptr.h" -#import "chrome/browser/cocoa/bookmark_model_observer_for_cocoa.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h" class BookmarkBubbleNotificationBridge; class BookmarkModel; diff --git a/chrome/browser/cocoa/bookmark_bubble_controller.mm b/chrome/browser/cocoa/bookmarks/bookmark_bubble_controller.mm index 0258d0d..d367ff9 100644 --- a/chrome/browser/cocoa/bookmark_bubble_controller.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_bubble_controller.mm @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "chrome/browser/cocoa/bookmark_bubble_controller.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bubble_controller.h" #include "app/l10n_util_mac.h" #include "base/mac_util.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" // TODO(viettrungluu): remove #include "chrome/browser/bookmarks/bookmark_model.h" -#import "chrome/browser/cocoa/bookmark_button.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_button.h" #import "chrome/browser/cocoa/browser_window_controller.h" #import "chrome/browser/cocoa/info_bubble_view.h" #include "chrome/browser/metrics/user_metrics.h" diff --git a/chrome/browser/cocoa/bookmark_bubble_controller_unittest.mm b/chrome/browser/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm index 2c445f3..9bb5037 100644 --- a/chrome/browser/cocoa/bookmark_bubble_controller_unittest.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/scoped_nsobject.h" #include "base/utf_string_conversions.h" -#import "chrome/browser/cocoa/bookmark_bubble_controller.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bubble_controller.h" #include "chrome/browser/cocoa/browser_test_helper.h" #include "chrome/browser/cocoa/browser_window_controller.h" #import "chrome/browser/cocoa/cocoa_test_helper.h" diff --git a/chrome/browser/cocoa/bookmark_button.h b/chrome/browser/cocoa/bookmarks/bookmark_button.h index 56d9bc1..56d9bc1 100644 --- a/chrome/browser/cocoa/bookmark_button.h +++ b/chrome/browser/cocoa/bookmarks/bookmark_button.h diff --git a/chrome/browser/cocoa/bookmark_button.mm b/chrome/browser/cocoa/bookmarks/bookmark_button.mm index 6c773d6..87f4821 100644 --- a/chrome/browser/cocoa/bookmark_button.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_button.mm @@ -2,11 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "chrome/browser/cocoa/bookmark_button.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_button.h" + #include "base/logging.h" #import "base/scoped_nsobject.h" #include "chrome/browser/bookmarks/bookmark_model.h" -#import "chrome/browser/cocoa/bookmark_button_cell.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_button_cell.h" #import "chrome/browser/cocoa/browser_window_controller.h" #import "chrome/browser/cocoa/view_id_util.h" #include "chrome/browser/metrics/user_metrics.h" diff --git a/chrome/browser/cocoa/bookmark_button_cell.h b/chrome/browser/cocoa/bookmarks/bookmark_button_cell.h index 23bd601..45d83e3 100644 --- a/chrome/browser/cocoa/bookmark_button_cell.h +++ b/chrome/browser/cocoa/bookmarks/bookmark_button_cell.h @@ -1,9 +1,9 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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_COCOA_BOOKMARK_BUTTON_CELL_H_ -#define CHROME_BROWSER_COCOA_BOOKMARK_BUTTON_CELL_H_ +#ifndef CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_BUTTON_CELL_H_ +#define CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_BUTTON_CELL_H_ #pragma once #import "base/cocoa_protocols_mac.h" @@ -62,4 +62,4 @@ class BookmarkNode; @end -#endif // CHROME_BROWSER_COCOA_BOOKMARK_BUTTON_CELL_H_ +#endif // CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_BUTTON_CELL_H_ diff --git a/chrome/browser/cocoa/bookmark_button_cell.mm b/chrome/browser/cocoa/bookmarks/bookmark_button_cell.mm index 55d9e87..cb97411 100644 --- a/chrome/browser/cocoa/bookmark_button_cell.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_button_cell.mm @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "chrome/browser/cocoa/bookmark_button_cell.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_button_cell.h" #include "app/l10n_util_mac.h" #include "base/logging.h" #include "base/nsimage_cache_mac.h" #include "base/sys_string_conversions.h" #import "chrome/browser/bookmarks/bookmark_model.h" -#import "chrome/browser/cocoa/bookmark_menu.h" -#import "chrome/browser/cocoa/bookmark_button.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_menu.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_button.h" #import "chrome/browser/cocoa/image_utils.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/cocoa/bookmark_button_cell_unittest.mm b/chrome/browser/cocoa/bookmarks/bookmark_button_cell_unittest.mm index 7d483bb..15d3a60 100644 --- a/chrome/browser/cocoa/bookmark_button_cell_unittest.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_button_cell_unittest.mm @@ -6,8 +6,8 @@ #include "base/scoped_nsobject.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" -#import "chrome/browser/cocoa/bookmark_button_cell.h" -#import "chrome/browser/cocoa/bookmark_menu.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_button_cell.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_menu.h" #include "chrome/browser/cocoa/browser_test_helper.h" #import "chrome/browser/cocoa/cocoa_test_helper.h" #include "grit/app_resources.h" diff --git a/chrome/browser/cocoa/bookmark_button_unittest.mm b/chrome/browser/cocoa/bookmarks/bookmark_button_unittest.mm index 59cb39e..ed8964a 100644 --- a/chrome/browser/cocoa/bookmark_button_unittest.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_button_unittest.mm @@ -5,8 +5,8 @@ #include "base/scoped_nsobject.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" -#import "chrome/browser/cocoa/bookmark_button.h" -#import "chrome/browser/cocoa/bookmark_button_cell.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_button.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_button_cell.h" #import "chrome/browser/cocoa/browser_test_helper.h" #import "chrome/browser/cocoa/cocoa_test_helper.h" #import "chrome/browser/cocoa/test_event_utils.h" diff --git a/chrome/browser/cocoa/bookmark_drag_source.h b/chrome/browser/cocoa/bookmarks/bookmark_drag_source.h index fde2086..fde2086 100644 --- a/chrome/browser/cocoa/bookmark_drag_source.h +++ b/chrome/browser/cocoa/bookmarks/bookmark_drag_source.h diff --git a/chrome/browser/cocoa/bookmark_drag_source.mm b/chrome/browser/cocoa/bookmarks/bookmark_drag_source.mm index 81e55e6..f6c024c 100644 --- a/chrome/browser/cocoa/bookmark_drag_source.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_drag_source.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "chrome/browser/cocoa/bookmark_drag_source.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_drag_source.h" #include "chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.h" #include "chrome/browser/profile.h" diff --git a/chrome/browser/cocoa/bookmark_editor_base_controller.h b/chrome/browser/cocoa/bookmarks/bookmark_editor_base_controller.h index 34705bd..5880d79 100644 --- a/chrome/browser/cocoa/bookmark_editor_base_controller.h +++ b/chrome/browser/cocoa/bookmarks/bookmark_editor_base_controller.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_COCOA_BOOKMARK_EDITOR_BASE_CONTROLLER_H_ -#define CHROME_BROWSER_COCOA_BOOKMARK_EDITOR_BASE_CONTROLLER_H_ +#ifndef CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_EDITOR_BASE_CONTROLLER_H_ +#define CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_EDITOR_BASE_CONTROLLER_H_ #pragma once #import <Cocoa/Cocoa.h> @@ -168,4 +168,4 @@ class BookmarkModel; @end -#endif // CHROME_BROWSER_COCOA_BOOKMARK_EDITOR_BASE_CONTROLLER_H_ +#endif // CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_EDITOR_BASE_CONTROLLER_H_ diff --git a/chrome/browser/cocoa/bookmark_editor_base_controller.mm b/chrome/browser/cocoa/bookmarks/bookmark_editor_base_controller.mm index 03a7942..1f0274e 100644 --- a/chrome/browser/cocoa/bookmark_editor_base_controller.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_editor_base_controller.mm @@ -4,16 +4,17 @@ #include <stack> -#import "chrome/browser/cocoa/bookmark_editor_base_controller.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_editor_base_controller.h" + #include "app/l10n_util.h" #include "app/l10n_util_mac.h" #include "base/logging.h" #include "base/mac_util.h" #include "base/sys_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" -#import "chrome/browser/cocoa/bookmark_all_tabs_controller.h" -#import "chrome/browser/cocoa/bookmark_editor_controller.h" -#import "chrome/browser/cocoa/bookmark_tree_browser_cell.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_all_tabs_controller.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_editor_controller.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_tree_browser_cell.h" #import "chrome/browser/cocoa/browser_window_controller.h" #include "chrome/browser/profile.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/cocoa/bookmark_editor_base_controller_unittest.mm b/chrome/browser/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm index 363461b..daac540 100644 --- a/chrome/browser/cocoa/bookmark_editor_base_controller_unittest.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm @@ -9,7 +9,7 @@ #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" -#import "chrome/browser/cocoa/bookmark_editor_controller.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_editor_controller.h" #include "chrome/browser/cocoa/browser_test_helper.h" #import "chrome/browser/cocoa/cocoa_test_helper.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/cocoa/bookmark_editor_controller.h b/chrome/browser/cocoa/bookmarks/bookmark_editor_controller.h index 696c1d2..11bd58c 100644 --- a/chrome/browser/cocoa/bookmark_editor_controller.h +++ b/chrome/browser/cocoa/bookmarks/bookmark_editor_controller.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_COCOA_BOOKMARK_EDITOR_CONTROLLER_H_ -#define CHROME_BROWSER_COCOA_BOOKMARK_EDITOR_CONTROLLER_H_ +#ifndef CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_EDITOR_CONTROLLER_H_ +#define CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_EDITOR_CONTROLLER_H_ #pragma once -#import "chrome/browser/cocoa/bookmark_editor_base_controller.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_editor_base_controller.h" // A controller for the bookmark editor, opened by 1) Edit... from the // context menu of a bookmark button, and 2) Bookmark this Page...'s Edit @@ -33,4 +33,4 @@ - (NSColor *)urlFieldColor; @end -#endif // CHROME_BROWSER_COCOA_BOOKMARK_EDITOR_CONTROLLER_H_ +#endif // CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_EDITOR_CONTROLLER_H_ diff --git a/chrome/browser/cocoa/bookmark_editor_controller.mm b/chrome/browser/cocoa/bookmarks/bookmark_editor_controller.mm index 90b47ed..14500c9 100644 --- a/chrome/browser/cocoa/bookmark_editor_controller.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_editor_controller.mm @@ -2,7 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "chrome/browser/cocoa/bookmark_editor_controller.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_editor_controller.h" + #include "app/l10n_util.h" #include "base/string16.h" #include "base/sys_string_conversions.h" diff --git a/chrome/browser/cocoa/bookmark_editor_controller_unittest.mm b/chrome/browser/cocoa/bookmarks/bookmark_editor_controller_unittest.mm index 8c826ac..e19898d 100644 --- a/chrome/browser/cocoa/bookmark_editor_controller_unittest.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_editor_controller_unittest.mm @@ -8,7 +8,7 @@ #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" -#import "chrome/browser/cocoa/bookmark_editor_controller.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_editor_controller.h" #include "chrome/browser/cocoa/browser_test_helper.h" #import "chrome/browser/cocoa/cocoa_test_helper.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/cocoa/bookmark_folder_target.h b/chrome/browser/cocoa/bookmarks/bookmark_folder_target.h index 60c766b..c877f72 100644 --- a/chrome/browser/cocoa/bookmark_folder_target.h +++ b/chrome/browser/cocoa/bookmarks/bookmark_folder_target.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_COCOA_BOOKMARK_FOLDER_TARGET_CONTROLLER_H_ -#define CHROME_BROWSER_COCOA_BOOKMARK_FOLDER_TARGET_CONTROLLER_H_ +#ifndef CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_FOLDER_TARGET_CONTROLLER_H_ +#define CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_FOLDER_TARGET_CONTROLLER_H_ #pragma once #import <Cocoa/Cocoa.h> @@ -47,4 +47,4 @@ class BookmarkNode; // pointer to the |BookmarkButton| being dragged. extern NSString* kBookmarkButtonDragType; -#endif // CHROME_BROWSER_COCOA_BOOKMARK_FOLDER_TARGET_CONTROLLER_H_ +#endif // CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_FOLDER_TARGET_CONTROLLER_H_ diff --git a/chrome/browser/cocoa/bookmark_folder_target.mm b/chrome/browser/cocoa/bookmarks/bookmark_folder_target.mm index 1aac77f..3fb1507 100644 --- a/chrome/browser/cocoa/bookmark_folder_target.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_folder_target.mm @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "chrome/browser/cocoa/bookmark_folder_target.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_folder_target.h" #include "base/logging.h" #include "base/sys_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" -#import "chrome/browser/cocoa/bookmark_bar_folder_controller.h" -#import "chrome/browser/cocoa/bookmark_button.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_folder_controller.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_button.h" #import "chrome/browser/cocoa/event_utils.h" #import "third_party/mozilla/NSPasteboard+Utils.h" diff --git a/chrome/browser/cocoa/bookmark_folder_target_unittest.mm b/chrome/browser/cocoa/bookmarks/bookmark_folder_target_unittest.mm index 22f421f..ae5a6a0 100644 --- a/chrome/browser/cocoa/bookmark_folder_target_unittest.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_folder_target_unittest.mm @@ -3,10 +3,10 @@ // found in the LICENSE file. #include "chrome/browser/bookmarks/bookmark_model.h" -#import "chrome/browser/cocoa/bookmark_bar_controller.h" -#import "chrome/browser/cocoa/bookmark_bar_folder_controller.h" -#import "chrome/browser/cocoa/bookmark_folder_target.h" -#include "chrome/browser/cocoa/bookmark_button.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_controller.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_folder_controller.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_folder_target.h" +#include "chrome/browser/cocoa/bookmarks/bookmark_button.h" #include "chrome/browser/cocoa/browser_test_helper.h" #include "chrome/browser/cocoa/cocoa_test_helper.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/cocoa/bookmark_menu.h b/chrome/browser/cocoa/bookmarks/bookmark_menu.h index d4ac001..d4ac001 100644 --- a/chrome/browser/cocoa/bookmark_menu.h +++ b/chrome/browser/cocoa/bookmarks/bookmark_menu.h diff --git a/chrome/browser/cocoa/bookmark_menu.mm b/chrome/browser/cocoa/bookmarks/bookmark_menu.mm index 514aaf1..9be848b 100644 --- a/chrome/browser/cocoa/bookmark_menu.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_menu.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "chrome/browser/cocoa/bookmark_menu.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_menu.h" @implementation BookmarkMenu diff --git a/chrome/browser/cocoa/bookmark_menu_bridge.h b/chrome/browser/cocoa/bookmarks/bookmark_menu_bridge.h index f39f0a6..bc606fc 100644 --- a/chrome/browser/cocoa/bookmark_menu_bridge.h +++ b/chrome/browser/cocoa/bookmarks/bookmark_menu_bridge.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. @@ -17,11 +17,12 @@ // BookmarkMenuCocoaController instead of firstResponder. // See BookmarkMenuBridge::AddNodeToMenu()). -#ifndef CHROME_BROWSER_COCOA_BOOKMARK_MENU_BRIDGE_H_ -#define CHROME_BROWSER_COCOA_BOOKMARK_MENU_BRIDGE_H_ +#ifndef CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_MENU_BRIDGE_H_ +#define CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_MENU_BRIDGE_H_ #pragma once #include <map> + #include "base/scoped_nsobject.h" #include "chrome/browser/bookmarks/bookmark_model_observer.h" @@ -119,4 +120,4 @@ class BookmarkMenuBridge : public BookmarkModelObserver { std::map<const BookmarkNode*, NSMenuItem*> bookmark_nodes_; }; -#endif // CHROME_BROWSER_COCOA_BOOKMARK_MENU_BRIDGE_H_ +#endif // CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_MENU_BRIDGE_H_ diff --git a/chrome/browser/cocoa/bookmark_menu_bridge.mm b/chrome/browser/cocoa/bookmarks/bookmark_menu_bridge.mm index 493e5e8..d7a3868 100644 --- a/chrome/browser/cocoa/bookmark_menu_bridge.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_menu_bridge.mm @@ -12,8 +12,8 @@ #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_list.h" -#include "chrome/browser/cocoa/bookmark_menu_bridge.h" -#import "chrome/browser/cocoa/bookmark_menu_cocoa_controller.h" +#include "chrome/browser/cocoa/bookmarks/bookmark_menu_bridge.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_menu_cocoa_controller.h" #include "chrome/browser/profile.h" #include "chrome/browser/profile_manager.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/cocoa/bookmark_menu_bridge_unittest.mm b/chrome/browser/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm index 56590ff..4be2067 100644 --- a/chrome/browser/cocoa/bookmark_menu_bridge_unittest.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm @@ -11,7 +11,7 @@ #include "chrome/app/chrome_dll_resource.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/browser.h" -#include "chrome/browser/cocoa/bookmark_menu_bridge.h" +#include "chrome/browser/cocoa/bookmarks/bookmark_menu_bridge.h" #include "chrome/browser/cocoa/browser_test_helper.h" #include "testing/gtest/include/gtest/gtest.h" #import "testing/gtest_mac.h" diff --git a/chrome/browser/cocoa/bookmark_menu_cocoa_controller.h b/chrome/browser/cocoa/bookmarks/bookmark_menu_cocoa_controller.h index c78ea7b..dc5c221 100644 --- a/chrome/browser/cocoa/bookmark_menu_cocoa_controller.h +++ b/chrome/browser/cocoa/bookmarks/bookmark_menu_cocoa_controller.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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,8 +6,8 @@ // All bookmark menu item commands get directed here. // Unfortunately there is already a C++ class named BookmarkMenuController. -#ifndef CHROME_BROWSER_COCOA_BOOKMARK_MENU_COCOA_CONTROLLER_H_ -#define CHROME_BROWSER_COCOA_BOOKMARK_MENU_COCOA_CONTROLLER_H_ +#ifndef CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_MENU_COCOA_CONTROLLER_H_ +#define CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_MENU_COCOA_CONTROLLER_H_ #pragma once #import <Cocoa/Cocoa.h> @@ -43,4 +43,4 @@ class BookmarkMenuBridge; - (void)openURLForNode:(const BookmarkNode*)node; @end // BookmarkMenuCocoaController (ExposedForUnitTests) -#endif // CHROME_BROWSER_COCOA_BOOKMARK_MENU_COCOA_CONTROLLER_H_ +#endif // CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_MENU_COCOA_CONTROLLER_H_ diff --git a/chrome/browser/cocoa/bookmark_menu_cocoa_controller.mm b/chrome/browser/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm index 898e2f9..5696fe8 100644 --- a/chrome/browser/cocoa/bookmark_menu_cocoa_controller.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "chrome/browser/cocoa/bookmark_menu_cocoa_controller.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_menu_cocoa_controller.h" #include "app/text_elider.h" #include "base/sys_string_conversions.h" @@ -11,7 +11,7 @@ #import "chrome/browser/app_controller_mac.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/browser.h" -#import "chrome/browser/cocoa/bookmark_menu_bridge.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_menu_bridge.h" #include "chrome/browser/cocoa/event_utils.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/tab_contents/tab_contents.h" diff --git a/chrome/browser/cocoa/bookmark_menu_cocoa_controller_unittest.mm b/chrome/browser/cocoa/bookmarks/bookmark_menu_cocoa_controller_unittest.mm index f63d7c3..7e0d2d6 100644 --- a/chrome/browser/cocoa/bookmark_menu_cocoa_controller_unittest.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_menu_cocoa_controller_unittest.mm @@ -6,7 +6,7 @@ #include "chrome/browser/browser.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/cocoa/browser_test_helper.h" -#import "chrome/browser/cocoa/bookmark_menu_cocoa_controller.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_menu_cocoa_controller.h" #include "testing/gtest/include/gtest/gtest.h" @interface FakeBookmarkMenuController : BookmarkMenuCocoaController { diff --git a/chrome/browser/cocoa/bookmark_menu_unittest.mm b/chrome/browser/cocoa/bookmarks/bookmark_menu_unittest.mm index d7797b2..bed4f55 100644 --- a/chrome/browser/cocoa/bookmark_menu_unittest.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_menu_unittest.mm @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/scoped_nsobject.h" -#import "chrome/browser/cocoa/bookmark_menu.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_menu.h" #import "chrome/browser/cocoa/cocoa_test_helper.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" diff --git a/chrome/browser/cocoa/bookmark_model_observer_for_cocoa.h b/chrome/browser/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h index 6b20fd1..4acc972 100644 --- a/chrome/browser/cocoa/bookmark_model_observer_for_cocoa.h +++ b/chrome/browser/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h @@ -16,8 +16,8 @@ // a list of "new parents"). But, just to be sure, notification // happens on any removal. -#ifndef CHROME_BROWSER_COCOA_BOOKMARK_MODEL_OBSERVER_FOR_COCOA_H -#define CHROME_BROWSER_COCOA_BOOKMARK_MODEL_OBSERVER_FOR_COCOA_H +#ifndef CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_MODEL_OBSERVER_FOR_COCOA_H +#define CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_MODEL_OBSERVER_FOR_COCOA_H #pragma once #import <Cocoa/Cocoa.h> @@ -113,5 +113,4 @@ class BookmarkModelObserverForCocoa : public BookmarkModelObserver { DISALLOW_COPY_AND_ASSIGN(BookmarkModelObserverForCocoa); }; -#endif // CHROME_BROWSER_COCOA_BOOKMARK_MODEL_OBSERVER_FOR_COCOA_H - +#endif // CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_MODEL_OBSERVER_FOR_COCOA_H diff --git a/chrome/browser/cocoa/bookmark_model_observer_for_cocoa_unittest.mm b/chrome/browser/cocoa/bookmarks/bookmark_model_observer_for_cocoa_unittest.mm index 1008ef8..a84cc53 100644 --- a/chrome/browser/cocoa/bookmark_model_observer_for_cocoa_unittest.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_model_observer_for_cocoa_unittest.mm @@ -7,7 +7,7 @@ #include "base/scoped_ptr.h" #include "base/scoped_nsobject.h" #include "base/utf_string_conversions.h" -#import "chrome/browser/cocoa/bookmark_model_observer_for_cocoa.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h" #import "chrome/browser/cocoa/browser_test_helper.h" #import "chrome/browser/cocoa/cocoa_test_helper.h" diff --git a/chrome/browser/cocoa/bookmark_name_folder_controller.h b/chrome/browser/cocoa/bookmarks/bookmark_name_folder_controller.h index 1d944a0..7de139f 100644 --- a/chrome/browser/cocoa/bookmark_name_folder_controller.h +++ b/chrome/browser/cocoa/bookmarks/bookmark_name_folder_controller.h @@ -1,9 +1,9 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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_COCOA_BOOKMARK_NAME_FOLDER_CONTROLLER_H_ -#define CHROME_BROWSER_COCOA_BOOKMARK_NAME_FOLDER_CONTROLLER_H_ +#ifndef CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_NAME_FOLDER_CONTROLLER_H_ +#define CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_NAME_FOLDER_CONTROLLER_H_ #pragma once #import <Cocoa/Cocoa.h> @@ -61,4 +61,4 @@ class BookmarkModelObserverForCocoa; - (NSButton*)okButton; @end -#endif /* CHROME_BROWSER_COCOA_BOOKMARK_NAME_FOLDER_CONTROLLER_H_ */ +#endif // CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_NAME_FOLDER_CONTROLLER_H_ diff --git a/chrome/browser/cocoa/bookmark_name_folder_controller.mm b/chrome/browser/cocoa/bookmarks/bookmark_name_folder_controller.mm index a854b8f..fe8cdfd 100644 --- a/chrome/browser/cocoa/bookmark_name_folder_controller.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_name_folder_controller.mm @@ -2,13 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "chrome/browser/cocoa/bookmark_name_folder_controller.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_name_folder_controller.h" + #include "app/l10n_util.h" #include "app/l10n_util_mac.h" #include "base/mac_util.h" #include "base/sys_string_conversions.h" +#include "chrome/browser/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h" #include "chrome/browser/profile.h" -#include "chrome/browser/cocoa/bookmark_model_observer_for_cocoa.h" #include "grit/generated_resources.h" @implementation BookmarkNameFolderController diff --git a/chrome/browser/cocoa/bookmark_name_folder_controller_unittest.mm b/chrome/browser/cocoa/bookmarks/bookmark_name_folder_controller_unittest.mm index f78cf22..3a435f7 100644 --- a/chrome/browser/cocoa/bookmark_name_folder_controller_unittest.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_name_folder_controller_unittest.mm @@ -6,7 +6,7 @@ #include "base/scoped_nsobject.h" #include "base/utf_string_conversions.h" -#import "chrome/browser/cocoa/bookmark_name_folder_controller.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_name_folder_controller.h" #include "chrome/browser/cocoa/browser_test_helper.h" #import "chrome/browser/cocoa/cocoa_test_helper.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/cocoa/bookmark_tree_browser_cell.h b/chrome/browser/cocoa/bookmarks/bookmark_tree_browser_cell.h index d083b5b..7cdee51 100644 --- a/chrome/browser/cocoa/bookmark_tree_browser_cell.h +++ b/chrome/browser/cocoa/bookmarks/bookmark_tree_browser_cell.h @@ -1,9 +1,9 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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_COCOA_BOOKMARK_TREE_BROWSER_CELL_H_ -#define CHROME_BROWSER_COCOA_BOOKMARK_TREE_BROWSER_CELL_H_ +#ifndef CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_TREE_BROWSER_CELL_H_ +#define CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_TREE_BROWSER_CELL_H_ #pragma once #import <Cocoa/Cocoa.h> @@ -32,4 +32,4 @@ class BookmarkNode; @end -#endif // CHROME_BROWSER_COCOA_BOOKMARK_TREE_BROWSER_CELL_H_ +#endif // CHROME_BROWSER_COCOA_BOOKMARKS_BOOKMARK_TREE_BROWSER_CELL_H_ diff --git a/chrome/browser/cocoa/bookmark_tree_browser_cell.mm b/chrome/browser/cocoa/bookmarks/bookmark_tree_browser_cell.mm index 27801e1..b778858 100644 --- a/chrome/browser/cocoa/bookmark_tree_browser_cell.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_tree_browser_cell.mm @@ -1,8 +1,9 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. -#import "chrome/browser/cocoa/bookmark_tree_browser_cell.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_tree_browser_cell.h" + #include "chrome/browser/bookmarks/bookmark_model.h" @implementation BookmarkTreeBrowserCell diff --git a/chrome/browser/cocoa/bookmark_tree_browser_cell_unittest.mm b/chrome/browser/cocoa/bookmarks/bookmark_tree_browser_cell_unittest.mm index 82fe455..a8418e2 100644 --- a/chrome/browser/cocoa/bookmark_tree_browser_cell_unittest.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_tree_browser_cell_unittest.mm @@ -1,11 +1,11 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. #import <Cocoa/Cocoa.h> #include "chrome/browser/bookmarks/bookmark_model.h" -#import "chrome/browser/cocoa/bookmark_tree_browser_cell.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_tree_browser_cell.h" #import "chrome/browser/cocoa/cocoa_test_helper.h" #include "testing/platform_test.h" diff --git a/chrome/browser/cocoa/browser_window_controller.h b/chrome/browser/cocoa/browser_window_controller.h index 4825bbf..efa49ab 100644 --- a/chrome/browser/cocoa/browser_window_controller.h +++ b/chrome/browser/cocoa/browser_window_controller.h @@ -15,8 +15,8 @@ #include "base/scoped_nsobject.h" #include "base/scoped_ptr.h" -#import "chrome/browser/cocoa/bookmark_bar_controller.h" -#import "chrome/browser/cocoa/bookmark_bubble_controller.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_controller.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bubble_controller.h" #import "chrome/browser/cocoa/browser_command_executor.h" #import "chrome/browser/cocoa/tab_strip_controller.h" #import "chrome/browser/cocoa/tab_window_controller.h" diff --git a/chrome/browser/cocoa/browser_window_controller.mm b/chrome/browser/cocoa/browser_window_controller.mm index f0e2e9f..62374ea 100644 --- a/chrome/browser/cocoa/browser_window_controller.mm +++ b/chrome/browser/cocoa/browser_window_controller.mm @@ -18,8 +18,8 @@ #include "chrome/browser/browser.h" #include "chrome/browser/browser_list.h" #import "chrome/browser/cocoa/background_gradient_view.h" -#import "chrome/browser/cocoa/bookmark_bar_controller.h" -#import "chrome/browser/cocoa/bookmark_editor_controller.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_controller.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_editor_controller.h" #import "chrome/browser/cocoa/browser_window_cocoa.h" #import "chrome/browser/cocoa/browser_window_controller_private.h" #import "chrome/browser/cocoa/dev_tools_controller.h" diff --git a/chrome/browser/cocoa/draggable_button_unittest.mm b/chrome/browser/cocoa/draggable_button_unittest.mm index 3f5d521..e6f153d 100644 --- a/chrome/browser/cocoa/draggable_button_unittest.mm +++ b/chrome/browser/cocoa/draggable_button_unittest.mm @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/scoped_nsobject.h" -#import "chrome/browser/cocoa/bookmark_button.h" #import "chrome/browser/cocoa/cocoa_test_helper.h" +#import "chrome/browser/cocoa/draggable_button.h" #import "chrome/browser/cocoa/test_event_utils.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" diff --git a/chrome/browser/cocoa/tabpose_window.mm b/chrome/browser/cocoa/tabpose_window.mm index 011f10a..ca80dc5 100644 --- a/chrome/browser/cocoa/tabpose_window.mm +++ b/chrome/browser/cocoa/tabpose_window.mm @@ -12,7 +12,7 @@ #include "base/sys_string_conversions.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/browser/browser_process.h" -#import "chrome/browser/cocoa/bookmark_bar_constants.h" +#import "chrome/browser/cocoa/bookmarks/bookmark_bar_constants.h" #import "chrome/browser/cocoa/browser_window_controller.h" #import "chrome/browser/cocoa/tab_strip_controller.h" #import "chrome/browser/cocoa/tab_strip_model_observer_bridge.h" diff --git a/chrome/browser/dom_ui/ntp_resource_cache.cc b/chrome/browser/dom_ui/ntp_resource_cache.cc index 1c514d5..a1b8bf0 100644 --- a/chrome/browser/dom_ui/ntp_resource_cache.cc +++ b/chrome/browser/dom_ui/ntp_resource_cache.cc @@ -43,7 +43,7 @@ #if defined(OS_WIN) || defined(TOOLKIT_VIEWS) #include "chrome/browser/views/bookmark_bar_view.h" #elif defined(OS_MACOSX) -#include "chrome/browser/cocoa/bookmark_bar_constants.h" +#include "chrome/browser/cocoa/bookmarks/bookmark_bar_constants.h" #elif defined(OS_POSIX) #include "chrome/browser/gtk/bookmark_bar_gtk.h" #endif diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index cd7309f..bcfca8ce 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -813,53 +813,53 @@ 'browser/cocoa/browser_accessibility.mm', 'browser/cocoa/browser_accessibility_delegate.h', 'browser/cocoa/browser_window_factory.mm', - 'browser/cocoa/bookmark_all_tabs_controller.h', - 'browser/cocoa/bookmark_all_tabs_controller.mm', - 'browser/cocoa/bookmark_bar_bridge.h', - 'browser/cocoa/bookmark_bar_bridge.mm', - 'browser/cocoa/bookmark_bar_constants.h', - 'browser/cocoa/bookmark_bar_controller.h', - 'browser/cocoa/bookmark_bar_controller.mm', - 'browser/cocoa/bookmark_bar_folder_button_cell.h', - 'browser/cocoa/bookmark_bar_folder_button_cell.mm', - 'browser/cocoa/bookmark_bar_folder_controller.h', - 'browser/cocoa/bookmark_bar_folder_controller.mm', - 'browser/cocoa/bookmark_bar_folder_hover_state.h', - 'browser/cocoa/bookmark_bar_folder_hover_state.mm', - 'browser/cocoa/bookmark_bar_folder_view.h', - 'browser/cocoa/bookmark_bar_folder_view.mm', - 'browser/cocoa/bookmark_bar_folder_window.h', - 'browser/cocoa/bookmark_bar_folder_window.mm', - 'browser/cocoa/bookmark_bar_state.h', - 'browser/cocoa/bookmark_bar_toolbar_view.h', - 'browser/cocoa/bookmark_bar_toolbar_view.mm', - 'browser/cocoa/bookmark_bar_view.h', - 'browser/cocoa/bookmark_bar_view.mm', - 'browser/cocoa/bookmark_bubble_controller.h', - 'browser/cocoa/bookmark_bubble_controller.mm', - 'browser/cocoa/bookmark_button.h', - 'browser/cocoa/bookmark_button.mm', - 'browser/cocoa/bookmark_button_cell.h', - 'browser/cocoa/bookmark_button_cell.mm', - 'browser/cocoa/bookmark_drag_source.h', - 'browser/cocoa/bookmark_drag_source.mm', - 'browser/cocoa/bookmark_editor_base_controller.h', - 'browser/cocoa/bookmark_editor_base_controller.mm', - 'browser/cocoa/bookmark_editor_controller.h', - 'browser/cocoa/bookmark_editor_controller.mm', - 'browser/cocoa/bookmark_folder_target.h', - 'browser/cocoa/bookmark_folder_target.mm', - 'browser/cocoa/bookmark_menu.h', - 'browser/cocoa/bookmark_menu.mm', - 'browser/cocoa/bookmark_menu_bridge.h', - 'browser/cocoa/bookmark_menu_bridge.mm', - 'browser/cocoa/bookmark_menu_cocoa_controller.h', - 'browser/cocoa/bookmark_menu_cocoa_controller.mm', - 'browser/cocoa/bookmark_model_observer_for_cocoa.h', - 'browser/cocoa/bookmark_name_folder_controller.h', - 'browser/cocoa/bookmark_name_folder_controller.mm', - 'browser/cocoa/bookmark_tree_browser_cell.h', - 'browser/cocoa/bookmark_tree_browser_cell.mm', + 'browser/cocoa/bookmarks/bookmark_all_tabs_controller.h', + 'browser/cocoa/bookmarks/bookmark_all_tabs_controller.mm', + 'browser/cocoa/bookmarks/bookmark_bar_bridge.h', + 'browser/cocoa/bookmarks/bookmark_bar_bridge.mm', + 'browser/cocoa/bookmarks/bookmark_bar_constants.h', + 'browser/cocoa/bookmarks/bookmark_bar_controller.h', + 'browser/cocoa/bookmarks/bookmark_bar_controller.mm', + 'browser/cocoa/bookmarks/bookmark_bar_folder_button_cell.h', + 'browser/cocoa/bookmarks/bookmark_bar_folder_button_cell.mm', + 'browser/cocoa/bookmarks/bookmark_bar_folder_controller.h', + 'browser/cocoa/bookmarks/bookmark_bar_folder_controller.mm', + 'browser/cocoa/bookmarks/bookmark_bar_folder_hover_state.h', + 'browser/cocoa/bookmarks/bookmark_bar_folder_hover_state.mm', + 'browser/cocoa/bookmarks/bookmark_bar_folder_view.h', + 'browser/cocoa/bookmarks/bookmark_bar_folder_view.mm', + 'browser/cocoa/bookmarks/bookmark_bar_folder_window.h', + 'browser/cocoa/bookmarks/bookmark_bar_folder_window.mm', + 'browser/cocoa/bookmarks/bookmark_bar_state.h', + 'browser/cocoa/bookmarks/bookmark_bar_toolbar_view.h', + 'browser/cocoa/bookmarks/bookmark_bar_toolbar_view.mm', + 'browser/cocoa/bookmarks/bookmark_bar_view.h', + 'browser/cocoa/bookmarks/bookmark_bar_view.mm', + 'browser/cocoa/bookmarks/bookmark_bubble_controller.h', + 'browser/cocoa/bookmarks/bookmark_bubble_controller.mm', + 'browser/cocoa/bookmarks/bookmark_button.h', + 'browser/cocoa/bookmarks/bookmark_button.mm', + 'browser/cocoa/bookmarks/bookmark_button_cell.h', + 'browser/cocoa/bookmarks/bookmark_button_cell.mm', + 'browser/cocoa/bookmarks/bookmark_drag_source.h', + 'browser/cocoa/bookmarks/bookmark_drag_source.mm', + 'browser/cocoa/bookmarks/bookmark_editor_base_controller.h', + 'browser/cocoa/bookmarks/bookmark_editor_base_controller.mm', + 'browser/cocoa/bookmarks/bookmark_editor_controller.h', + 'browser/cocoa/bookmarks/bookmark_editor_controller.mm', + 'browser/cocoa/bookmarks/bookmark_folder_target.h', + 'browser/cocoa/bookmarks/bookmark_folder_target.mm', + 'browser/cocoa/bookmarks/bookmark_menu.h', + 'browser/cocoa/bookmarks/bookmark_menu.mm', + 'browser/cocoa/bookmarks/bookmark_menu_bridge.h', + 'browser/cocoa/bookmarks/bookmark_menu_bridge.mm', + 'browser/cocoa/bookmarks/bookmark_menu_cocoa_controller.h', + 'browser/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm', + 'browser/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h', + 'browser/cocoa/bookmarks/bookmark_name_folder_controller.h', + 'browser/cocoa/bookmarks/bookmark_name_folder_controller.mm', + 'browser/cocoa/bookmarks/bookmark_tree_browser_cell.h', + 'browser/cocoa/bookmarks/bookmark_tree_browser_cell.mm', 'browser/cocoa/browser_command_executor.h', 'browser/cocoa/browser_frame_view.h', 'browser/cocoa/browser_frame_view.mm', diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 4e8cc6c..f1e951e 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -1089,30 +1089,30 @@ 'browser/cocoa/background_gradient_view_unittest.mm', 'browser/cocoa/background_tile_view_unittest.mm', 'browser/cocoa/base_view_unittest.mm', - 'browser/cocoa/bookmark_all_tabs_controller_unittest.mm', - 'browser/cocoa/bookmark_bar_bridge_unittest.mm', - 'browser/cocoa/bookmark_bar_controller_unittest.mm', - 'browser/cocoa/bookmark_bar_folder_button_cell_unittest.mm', - 'browser/cocoa/bookmark_bar_folder_controller_unittest.mm', - 'browser/cocoa/bookmark_bar_folder_hover_state_unittest.mm', - 'browser/cocoa/bookmark_bar_folder_view_unittest.mm', - 'browser/cocoa/bookmark_bar_folder_window_unittest.mm', - 'browser/cocoa/bookmark_bar_toolbar_view_unittest.mm', - 'browser/cocoa/bookmark_bar_unittest_helper.h', - 'browser/cocoa/bookmark_bar_unittest_helper.mm', - 'browser/cocoa/bookmark_bar_view_unittest.mm', - 'browser/cocoa/bookmark_bubble_controller_unittest.mm', - 'browser/cocoa/bookmark_button_cell_unittest.mm', - 'browser/cocoa/bookmark_button_unittest.mm', - 'browser/cocoa/bookmark_editor_base_controller_unittest.mm', - 'browser/cocoa/bookmark_editor_controller_unittest.mm', - 'browser/cocoa/bookmark_folder_target_unittest.mm', - 'browser/cocoa/bookmark_menu_bridge_unittest.mm', - 'browser/cocoa/bookmark_menu_cocoa_controller_unittest.mm', - 'browser/cocoa/bookmark_menu_unittest.mm', - 'browser/cocoa/bookmark_model_observer_for_cocoa_unittest.mm', - 'browser/cocoa/bookmark_name_folder_controller_unittest.mm', - 'browser/cocoa/bookmark_tree_browser_cell_unittest.mm', + 'browser/cocoa/bookmarks/bookmark_all_tabs_controller_unittest.mm', + 'browser/cocoa/bookmarks/bookmark_bar_bridge_unittest.mm', + 'browser/cocoa/bookmarks/bookmark_bar_controller_unittest.mm', + 'browser/cocoa/bookmarks/bookmark_bar_folder_button_cell_unittest.mm', + 'browser/cocoa/bookmarks/bookmark_bar_folder_controller_unittest.mm', + 'browser/cocoa/bookmarks/bookmark_bar_folder_hover_state_unittest.mm', + 'browser/cocoa/bookmarks/bookmark_bar_folder_view_unittest.mm', + 'browser/cocoa/bookmarks/bookmark_bar_folder_window_unittest.mm', + 'browser/cocoa/bookmarks/bookmark_bar_toolbar_view_unittest.mm', + 'browser/cocoa/bookmarks/bookmark_bar_unittest_helper.h', + 'browser/cocoa/bookmarks/bookmark_bar_unittest_helper.mm', + 'browser/cocoa/bookmarks/bookmark_bar_view_unittest.mm', + 'browser/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm', + 'browser/cocoa/bookmarks/bookmark_button_cell_unittest.mm', + 'browser/cocoa/bookmarks/bookmark_button_unittest.mm', + 'browser/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm', + 'browser/cocoa/bookmarks/bookmark_editor_controller_unittest.mm', + 'browser/cocoa/bookmarks/bookmark_folder_target_unittest.mm', + 'browser/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm', + 'browser/cocoa/bookmarks/bookmark_menu_cocoa_controller_unittest.mm', + 'browser/cocoa/bookmarks/bookmark_menu_unittest.mm', + 'browser/cocoa/bookmarks/bookmark_model_observer_for_cocoa_unittest.mm', + 'browser/cocoa/bookmarks/bookmark_name_folder_controller_unittest.mm', + 'browser/cocoa/bookmarks/bookmark_tree_browser_cell_unittest.mm', 'browser/cocoa/browser_accessibility_unittest.mm', 'browser/cocoa/browser_frame_view_unittest.mm', 'browser/cocoa/browser_window_cocoa_unittest.mm', |