summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa/bookmarks
diff options
context:
space:
mode:
authorjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-18 20:41:35 +0000
committerjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-18 20:41:35 +0000
commitae04f59cd4978fa308f9521664dcaea8ef221d0f (patch)
tree0b4abe34cb533c28530b571e4d64801bfbf5933c /chrome/browser/cocoa/bookmarks
parent044f1235658e02ce8de72c8941c4e603fbd4be4e (diff)
downloadchromium_src-ae04f59cd4978fa308f9521664dcaea8ef221d0f.zip
chromium_src-ae04f59cd4978fa308f9521664dcaea8ef221d0f.tar.gz
chromium_src-ae04f59cd4978fa308f9521664dcaea8ef221d0f.tar.bz2
Cleanup: Include browser.h -> ui/browser.h [Final].
BUG=none TEST=none Review URL: http://codereview.chromium.org/5197001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66668 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/bookmarks')
-rw-r--r--chrome/browser/cocoa/bookmarks/bookmark_all_tabs_controller.mm4
-rw-r--r--chrome/browser/cocoa/bookmarks/bookmark_bar_controller.mm4
-rw-r--r--chrome/browser/cocoa/bookmarks/bookmark_menu_bridge.mm4
-rw-r--r--chrome/browser/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm2
-rw-r--r--chrome/browser/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm2
-rw-r--r--chrome/browser/cocoa/bookmarks/bookmark_menu_cocoa_controller_unittest.mm2
6 files changed, 9 insertions, 9 deletions
diff --git a/chrome/browser/cocoa/bookmarks/bookmark_all_tabs_controller.mm b/chrome/browser/cocoa/bookmarks/bookmark_all_tabs_controller.mm
index 125d8e1..961d37a 100644
--- a/chrome/browser/cocoa/bookmarks/bookmark_all_tabs_controller.mm
+++ b/chrome/browser/cocoa/bookmarks/bookmark_all_tabs_controller.mm
@@ -8,11 +8,11 @@
#include "base/string16.h"
#include "base/sys_string_conversions.h"
#include "chrome/browser/bookmarks/bookmark_model.h"
-#include "chrome/browser/browser.h"
-#include "chrome/browser/browser_list.h"
#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/browser/tab_contents_wrapper.h"
#include "chrome/browser/tabs/tab_strip_model.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_list.h"
#include "grit/generated_resources.h"
@implementation BookmarkAllTabsController
diff --git a/chrome/browser/cocoa/bookmarks/bookmark_bar_controller.mm b/chrome/browser/cocoa/bookmarks/bookmark_bar_controller.mm
index 79d8c23..33e61c2 100644
--- a/chrome/browser/cocoa/bookmarks/bookmark_bar_controller.mm
+++ b/chrome/browser/cocoa/bookmarks/bookmark_bar_controller.mm
@@ -11,8 +11,6 @@
#include "chrome/browser/bookmarks/bookmark_editor.h"
#include "chrome/browser/bookmarks/bookmark_model.h"
#include "chrome/browser/bookmarks/bookmark_utils.h"
-#include "chrome/browser/browser.h"
-#include "chrome/browser/browser_list.h"
#import "chrome/browser/cocoa/background_gradient_view.h"
#import "chrome/browser/cocoa/bookmarks/bookmark_bar_bridge.h"
#import "chrome/browser/cocoa/bookmarks/bookmark_bar_folder_controller.h"
@@ -41,6 +39,8 @@
#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/browser/tab_contents/tab_contents_view.h"
#import "chrome/browser/themes/browser_theme_provider.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_list.h"
#include "chrome/common/pref_names.h"
#include "grit/app_resources.h"
#include "grit/generated_resources.h"
diff --git a/chrome/browser/cocoa/bookmarks/bookmark_menu_bridge.mm b/chrome/browser/cocoa/bookmarks/bookmark_menu_bridge.mm
index 46a24a7..7145285 100644
--- a/chrome/browser/cocoa/bookmarks/bookmark_menu_bridge.mm
+++ b/chrome/browser/cocoa/bookmarks/bookmark_menu_bridge.mm
@@ -10,12 +10,12 @@
#include "base/sys_string_conversions.h"
#import "chrome/browser/app_controller_mac.h"
#include "chrome/browser/bookmarks/bookmark_model.h"
-#include "chrome/browser/browser.h"
-#include "chrome/browser/browser_list.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 "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_list.h"
#include "grit/generated_resources.h"
#include "grit/theme_resources.h"
#include "skia/ext/skia_utils_mac.h"
diff --git a/chrome/browser/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm b/chrome/browser/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm
index c2f9026..5f06ce5 100644
--- a/chrome/browser/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm
+++ b/chrome/browser/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm
@@ -10,9 +10,9 @@
#include "base/utf_string_conversions.h"
#include "chrome/app/chrome_command_ids.h"
#include "chrome/browser/bookmarks/bookmark_model.h"
-#include "chrome/browser/browser.h"
#include "chrome/browser/cocoa/bookmarks/bookmark_menu_bridge.h"
#include "chrome/browser/cocoa/browser_test_helper.h"
+#include "chrome/browser/ui/browser.h"
#include "testing/gtest/include/gtest/gtest.h"
#import "testing/gtest_mac.h"
#include "testing/platform_test.h"
diff --git a/chrome/browser/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm b/chrome/browser/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm
index 439bb2c..93ff846 100644
--- a/chrome/browser/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm
+++ b/chrome/browser/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm
@@ -10,11 +10,11 @@
#include "chrome/app/chrome_command_ids.h" // IDC_BOOKMARK_MENU
#import "chrome/browser/app_controller_mac.h"
#include "chrome/browser/bookmarks/bookmark_model.h"
-#include "chrome/browser/browser.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"
+#include "chrome/browser/ui/browser.h"
#include "webkit/glue/window_open_disposition.h"
namespace {
diff --git a/chrome/browser/cocoa/bookmarks/bookmark_menu_cocoa_controller_unittest.mm b/chrome/browser/cocoa/bookmarks/bookmark_menu_cocoa_controller_unittest.mm
index 7e0d2d6..8c0b4cde 100644
--- a/chrome/browser/cocoa/bookmarks/bookmark_menu_cocoa_controller_unittest.mm
+++ b/chrome/browser/cocoa/bookmarks/bookmark_menu_cocoa_controller_unittest.mm
@@ -3,10 +3,10 @@
// found in the LICENSE file.
#include "base/string16.h"
-#include "chrome/browser/browser.h"
#include "chrome/browser/bookmarks/bookmark_model.h"
#include "chrome/browser/cocoa/browser_test_helper.h"
#import "chrome/browser/cocoa/bookmarks/bookmark_menu_cocoa_controller.h"
+#include "chrome/browser/ui/browser.h"
#include "testing/gtest/include/gtest/gtest.h"
@interface FakeBookmarkMenuController : BookmarkMenuCocoaController {