chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa_unittest.mm - Issue 686993002: MacViews: Rename files to avoid duplicate basename conflicts.

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

Issue 686993002: MacViews: Rename files to avoid duplicate basename conflicts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 1 month 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

« no previous file with comments | « chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa.mm ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_unittest.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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.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/cocoa_profile_test.h"

16 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"	16 #import "chrome/browser/ui/cocoa/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"

(...skipping 296 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
318 EXPECT_TRUE([info draggingEnteredCalled]); // Ensure controller pinged.	318 EXPECT_TRUE([info draggingEnteredCalled]); // Ensure controller pinged.

319 EXPECT_TRUE([view_ dropIndicatorShown]);	319 EXPECT_TRUE([view_ dropIndicatorShown]);

320 EXPECT_EQ([view_ dropIndicatorPosition], kFakeIndicatorPos);	320 EXPECT_EQ([view_ dropIndicatorPosition], kFakeIndicatorPos);

321	321

322 [info setDropIndicatorShown:NO];	322 [info setDropIndicatorShown:NO];

323 EXPECT_EQ([view_ draggingEntered:(id)info.get()], NSDragOperationMove);	323 EXPECT_EQ([view_ draggingEntered:(id)info.get()], NSDragOperationMove);

324 EXPECT_FALSE([view_ dropIndicatorShown]);	324 EXPECT_FALSE([view_ dropIndicatorShown]);

325 }	325 }

326	326

327 } // namespace	327 } // namespace

OLD	NEW