| OLD | NEW |
| 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" | |
| 8 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
| 9 #include "base/scoped_nsobject.h" | 8 #include "base/scoped_nsobject.h" |
| 10 #include "base/string16.h" | 9 #include "base/string16.h" |
| 11 #include "base/string_util.h" | 10 #include "base/string_util.h" |
| 12 #include "base/sys_string_conversions.h" | 11 #include "base/sys_string_conversions.h" |
| 13 #include "base/utf_string_conversions.h" | 12 #include "base/utf_string_conversions.h" |
| 14 #include "chrome/browser/bookmarks/bookmark_model.h" | 13 #include "chrome/browser/bookmarks/bookmark_model.h" |
| 15 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h" | 14 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h" |
| 16 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h" | 15 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h" |
| 17 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.h" | 16 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.h" |
| 18 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_unittest_helper.h" | 17 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_unittest_helper.h" |
| 19 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view.h" | 18 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view.h" |
| 20 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h" | 19 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h" |
| 21 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.h" | 20 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.h" |
| 22 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu.h" | 21 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu.h" |
| 23 #include "chrome/browser/ui/cocoa/browser_test_helper.h" | 22 #include "chrome/browser/ui/cocoa/browser_test_helper.h" |
| 24 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" | 23 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" |
| 25 #include "chrome/browser/ui/cocoa/test_event_utils.h" | 24 #include "chrome/browser/ui/cocoa/test_event_utils.h" |
| 26 #import "chrome/browser/ui/cocoa/view_resizer_pong.h" | 25 #import "chrome/browser/ui/cocoa/view_resizer_pong.h" |
| 27 #include "chrome/test/model_test_utils.h" | 26 #include "chrome/test/model_test_utils.h" |
| 28 #include "testing/gtest/include/gtest/gtest.h" | 27 #include "testing/gtest/include/gtest/gtest.h" |
| 29 #import "testing/gtest_mac.h" | 28 #import "testing/gtest_mac.h" |
| 30 #include "testing/platform_test.h" | 29 #include "testing/platform_test.h" |
| 31 #import "third_party/ocmock/OCMock/OCMock.h" | 30 #import "third_party/ocmock/OCMock/OCMock.h" |
| 31 #include "ui/base/theme_provider.h" |
| 32 | 32 |
| 33 // Just like a BookmarkBarController but openURL: is stubbed out. | 33 // Just like a BookmarkBarController but openURL: is stubbed out. |
| 34 @interface BookmarkBarControllerNoOpen : BookmarkBarController { | 34 @interface BookmarkBarControllerNoOpen : BookmarkBarController { |
| 35 @public | 35 @public |
| 36 std::vector<GURL> urls_; | 36 std::vector<GURL> urls_; |
| 37 std::vector<WindowOpenDisposition> dispositions_; | 37 std::vector<WindowOpenDisposition> dispositions_; |
| 38 } | 38 } |
| 39 @end | 39 @end |
| 40 | 40 |
| 41 @implementation BookmarkBarControllerNoOpen | 41 @implementation BookmarkBarControllerNoOpen |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 163 std::vector<const BookmarkNode*> dragDataNodes; | 163 std::vector<const BookmarkNode*> dragDataNodes; |
| 164 if(dragDataNode_) { | 164 if(dragDataNode_) { |
| 165 dragDataNodes.push_back(dragDataNode_); | 165 dragDataNodes.push_back(dragDataNode_); |
| 166 } | 166 } |
| 167 return dragDataNodes; | 167 return dragDataNodes; |
| 168 } | 168 } |
| 169 | 169 |
| 170 @end | 170 @end |
| 171 | 171 |
| 172 | 172 |
| 173 class FakeTheme : public ThemeProvider { | 173 class FakeTheme : public ui::ThemeProvider { |
| 174 public: | 174 public: |
| 175 FakeTheme(NSColor* color) : color_(color) { } | 175 FakeTheme(NSColor* color) : color_(color) { } |
| 176 scoped_nsobject<NSColor> color_; | 176 scoped_nsobject<NSColor> color_; |
| 177 | 177 |
| 178 virtual void Init(Profile* profile) { } | 178 virtual void Init(Profile* profile) { } |
| 179 virtual SkBitmap* GetBitmapNamed(int id) const { return nil; } | 179 virtual SkBitmap* GetBitmapNamed(int id) const { return nil; } |
| 180 virtual SkColor GetColor(int id) const { return SkColor(); } | 180 virtual SkColor GetColor(int id) const { return SkColor(); } |
| 181 virtual bool GetDisplayProperty(int id, int* result) const { return false; } | 181 virtual bool GetDisplayProperty(int id, int* result) const { return false; } |
| 182 virtual bool ShouldUseNativeFrame() const { return false; } | 182 virtual bool ShouldUseNativeFrame() const { return false; } |
| 183 virtual bool HasCustomImage(int id) const { return false; } | 183 virtual bool HasCustomImage(int id) const { return false; } |
| (...skipping 1975 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2159 "2f3b ] 4b "); | 2159 "2f3b ] 4b "); |
| 2160 actual = model_test_utils::ModelStringFromNode(root); | 2160 actual = model_test_utils::ModelStringFromNode(root); |
| 2161 EXPECT_EQ(expected, actual); | 2161 EXPECT_EQ(expected, actual); |
| 2162 | 2162 |
| 2163 // Verify that the other bookmark folder can't be deleted. | 2163 // Verify that the other bookmark folder can't be deleted. |
| 2164 BookmarkButton *otherButton = [bar_ otherBookmarksButton]; | 2164 BookmarkButton *otherButton = [bar_ otherBookmarksButton]; |
| 2165 EXPECT_FALSE([bar_ canDragBookmarkButtonToTrash:otherButton]); | 2165 EXPECT_FALSE([bar_ canDragBookmarkButtonToTrash:otherButton]); |
| 2166 } | 2166 } |
| 2167 | 2167 |
| 2168 } // namespace | 2168 } // namespace |
| OLD | NEW |