chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm - Issue 16012017: Use a direct include of strings headers in chrome/browser/ui/cocoa/.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 16012017: Use a direct include of strings headers in chrome/browser/ui/cocoa/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

« no previous file with comments | « chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.mm ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_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 #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/memory/scoped_nsobject.h"	9 #include "base/memory/scoped_nsobject.h"

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

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

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

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

14 #include "chrome/browser/bookmarks/bookmark_model.h"	14 #include "chrome/browser/bookmarks/bookmark_model.h"

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

16 #include "chrome/browser/bookmarks/bookmark_utils.h"	16 #include "chrome/browser/bookmarks/bookmark_utils.h"

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

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

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

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

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

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

2070 actual = model_test_utils::ModelStringFromNode(root);	2070 actual = model_test_utils::ModelStringFromNode(root);

2071 EXPECT_EQ(expected, actual);	2071 EXPECT_EQ(expected, actual);

2072	2072

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

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

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

2076 }	2076 }

2077	2077

2078 } // namespace	2078 } // namespace

OLD	NEW