Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1450)

Side by Side Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm

Issue 6122006: Cleanup: Remove unneeded includes of pref_names.h (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import <Cocoa/Cocoa.h> 5 #import <Cocoa/Cocoa.h>
6 6
7 #include "app/theme_provider.h" 7 #include "app/theme_provider.h"
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/scoped_nsobject.h" 9 #include "base/scoped_nsobject.h"
10 #include "base/string16.h" 10 #include "base/string16.h"
11 #include "base/string_util.h" 11 #include "base/string_util.h"
12 #include "base/sys_string_conversions.h" 12 #include "base/sys_string_conversions.h"
13 #include "base/utf_string_conversions.h" 13 #include "base/utf_string_conversions.h"
14 #include "chrome/browser/bookmarks/bookmark_model.h" 14 #include "chrome/browser/bookmarks/bookmark_model.h"
15 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h" 15 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h"
16 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h" 16 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
17 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.h" 17 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.h"
18 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_unittest_helper.h" 18 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_unittest_helper.h"
19 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view.h" 19 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view.h"
20 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h" 20 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h"
21 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.h" 21 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.h"
22 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu.h" 22 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu.h"
23 #include "chrome/browser/ui/cocoa/browser_test_helper.h" 23 #include "chrome/browser/ui/cocoa/browser_test_helper.h"
24 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" 24 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
25 #include "chrome/browser/ui/cocoa/test_event_utils.h" 25 #include "chrome/browser/ui/cocoa/test_event_utils.h"
26 #import "chrome/browser/ui/cocoa/view_resizer_pong.h" 26 #import "chrome/browser/ui/cocoa/view_resizer_pong.h"
27 #include "chrome/common/pref_names.h"
28 #include "chrome/test/model_test_utils.h" 27 #include "chrome/test/model_test_utils.h"
29 #include "testing/gtest/include/gtest/gtest.h" 28 #include "testing/gtest/include/gtest/gtest.h"
30 #import "testing/gtest_mac.h" 29 #import "testing/gtest_mac.h"
31 #include "testing/platform_test.h" 30 #include "testing/platform_test.h"
32 #import "third_party/ocmock/OCMock/OCMock.h" 31 #import "third_party/ocmock/OCMock/OCMock.h"
33 32
34 // Just like a BookmarkBarController but openURL: is stubbed out. 33 // Just like a BookmarkBarController but openURL: is stubbed out.
35 @interface BookmarkBarControllerNoOpen : BookmarkBarController { 34 @interface BookmarkBarControllerNoOpen : BookmarkBarController {
36 @public 35 @public
37 std::vector<GURL> urls_; 36 std::vector<GURL> urls_;
(...skipping 2122 matching lines...) Expand 10 before | Expand all | Expand 10 after
2160 "2f3b ] 4b "); 2159 "2f3b ] 4b ");
2161 actual = model_test_utils::ModelStringFromNode(root); 2160 actual = model_test_utils::ModelStringFromNode(root);
2162 EXPECT_EQ(expected, actual); 2161 EXPECT_EQ(expected, actual);
2163 2162
2164 // Verify that the other bookmark folder can't be deleted. 2163 // Verify that the other bookmark folder can't be deleted.
2165 BookmarkButton *otherButton = [bar_ otherBookmarksButton]; 2164 BookmarkButton *otherButton = [bar_ otherBookmarksButton];
2166 EXPECT_FALSE([bar_ canDragBookmarkButtonToTrash:otherButton]); 2165 EXPECT_FALSE([bar_ canDragBookmarkButtonToTrash:otherButton]);
2167 } 2166 }
2168 2167
2169 } // namespace 2168 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698