| OLD | NEW | 
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #include "base/mac/scoped_nsobject.h" | 5 #include "base/mac/scoped_nsobject.h" | 
| 6 #include "base/strings/string16.h" | 6 #include "base/strings/string16.h" | 
| 7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" | 
| 8 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 8 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 
| 9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" | 
| 10 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h" | 10 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h" | 
| 11 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa.h" | 11 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa.h" | 
| 12 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h" | 12 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h" | 
| 13 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.h" | 13 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.h" | 
| 14 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.h" | 14 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.h" | 
| 15 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" | 15 #include "chrome/browser/ui/cocoa/test/cocoa_profile_test.h" | 
| 16 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" | 16 #import "chrome/browser/ui/cocoa/test/cocoa_test_helper.h" | 
| 17 #import "chrome/browser/ui/cocoa/url_drop_target.h" | 17 #import "chrome/browser/ui/cocoa/url_drop_target.h" | 
| 18 #include "chrome/test/base/testing_profile.h" | 18 #include "chrome/test/base/testing_profile.h" | 
| 19 #include "components/bookmarks/browser/bookmark_model.h" | 19 #include "components/bookmarks/browser/bookmark_model.h" | 
| 20 #include "components/bookmarks/test/bookmark_test_helpers.h" | 20 #include "components/bookmarks/test/bookmark_test_helpers.h" | 
| 21 #include "testing/gtest/include/gtest/gtest.h" | 21 #include "testing/gtest/include/gtest/gtest.h" | 
| 22 #include "testing/platform_test.h" | 22 #include "testing/platform_test.h" | 
| 23 #import "third_party/mozilla/NSPasteboard+Utils.h" | 23 #import "third_party/mozilla/NSPasteboard+Utils.h" | 
| 24 #include "ui/base/clipboard/clipboard_util_mac.h" | 24 #include "ui/base/clipboard/clipboard_util_mac.h" | 
| 25 | 25 | 
| 26 using bookmarks::BookmarkModel; | 26 using bookmarks::BookmarkModel; | 
| (...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 329   EXPECT_TRUE([info draggingEnteredCalled]);  // Ensure controller pinged. | 329   EXPECT_TRUE([info draggingEnteredCalled]);  // Ensure controller pinged. | 
| 330   EXPECT_TRUE([view_ dropIndicatorShown]); | 330   EXPECT_TRUE([view_ dropIndicatorShown]); | 
| 331   EXPECT_EQ([view_ dropIndicatorPosition], kFakeIndicatorPos); | 331   EXPECT_EQ([view_ dropIndicatorPosition], kFakeIndicatorPos); | 
| 332 | 332 | 
| 333   [info setDropIndicatorShown:NO]; | 333   [info setDropIndicatorShown:NO]; | 
| 334   EXPECT_EQ([view_ draggingEntered:(id)info.get()], NSDragOperationMove); | 334   EXPECT_EQ([view_ draggingEntered:(id)info.get()], NSDragOperationMove); | 
| 335   EXPECT_FALSE([view_ dropIndicatorShown]); | 335   EXPECT_FALSE([view_ dropIndicatorShown]); | 
| 336 } | 336 } | 
| 337 | 337 | 
| 338 }  // namespace | 338 }  // namespace | 
| OLD | NEW | 
|---|