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

Side by Side Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_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

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 #import <Cocoa/Cocoa.h>	5 #import <Cocoa/Cocoa.h>

6	6

7 #include "base/basictypes.h"	7 #include "base/basictypes.h"

8 #include "base/command_line.h"	8 #include "base/command_line.h"

9 #include "base/mac/mac_util.h"	9 #include "base/mac/mac_util.h"

10 #include "base/mac/scoped_nsobject.h"	10 #include "base/mac/scoped_nsobject.h"

11 #include "base/strings/string16.h"	11 #include "base/strings/string16.h"

12 #include "base/strings/string_util.h"	12 #include "base/strings/string_util.h"

13 #include "base/strings/sys_string_conversions.h"	13 #include "base/strings/sys_string_conversions.h"

14 #include "base/strings/utf_string_conversions.h"	14 #include "base/strings/utf_string_conversions.h"

15 #include "chrome/browser/bookmarks/bookmark_model_factory.h"	15 #include "chrome/browser/bookmarks/bookmark_model_factory.h"

16 #include "chrome/browser/extensions/test_extension_system.h"	16 #include "chrome/browser/extensions/test_extension_system.h"

17 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h"	17 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h"

18 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"	18 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"

19 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.h"	19 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.h"

20 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_unittest_helper.h"	20 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_unittest_helper.h"

21 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view.h"	21 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa.h"

22 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h"	22 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h"

23 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.h"	23 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.h"

24 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"	24 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"

25 #import "chrome/browser/ui/cocoa/view_resizer_pong.h"	25 #import "chrome/browser/ui/cocoa/view_resizer_pong.h"

26 #include "chrome/common/chrome_switches.h"	26 #include "chrome/common/chrome_switches.h"

27 #include "chrome/common/pref_names.h"	27 #include "chrome/common/pref_names.h"

28 #include "chrome/test/base/testing_pref_service_syncable.h"	28 #include "chrome/test/base/testing_pref_service_syncable.h"

29 #include "chrome/test/base/testing_profile.h"	29 #include "chrome/test/base/testing_profile.h"

30 #include "components/bookmarks/browser/bookmark_model.h"	30 #include "components/bookmarks/browser/bookmark_model.h"

31 #include "components/bookmarks/browser/bookmark_utils.h"	31 #include "components/bookmarks/browser/bookmark_utils.h"

(...skipping 2092 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
2124 "2f3b ] 4b ");	2124 "2f3b ] 4b ");

2125 actual = bookmarks::test::ModelStringFromNode(root);	2125 actual = bookmarks::test::ModelStringFromNode(root);

2126 EXPECT_EQ(expected, actual);	2126 EXPECT_EQ(expected, actual);

2127	2127

2128 // Verify that the other bookmark folder can't be deleted.	2128 // Verify that the other bookmark folder can't be deleted.

2129 BookmarkButton *otherButton = [bar_ otherBookmarksButton];	2129 BookmarkButton *otherButton = [bar_ otherBookmarksButton];

2130 EXPECT_FALSE([bar_ canDragBookmarkButtonToTrash:otherButton]);	2130 EXPECT_FALSE([bar_ canDragBookmarkButtonToTrash:otherButton]);

2131 }	2131 }

2132	2132

2133 } // namespace	2133 } // namespace

OLD	NEW