chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm - Issue 817153002: Switch users of foundation_util.h to include it directly and clean up uses of mac_util.h.

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_editor_base_controller.mm

Issue 817153002: Switch users of foundation_util.h to include it directly and clean up uses of mac_util.h. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

« no previous file with comments | « chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.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 <stack>	5 #include <stack>

6	6

7 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.h"	7 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.h"

8	8

9 #include "base/auto_reset.h"	9 #include "base/auto_reset.h"

10 #include "base/logging.h"	10 #include "base/logging.h"

11 #include "base/mac/bundle_locations.h"	11 #include "base/mac/bundle_locations.h"

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

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

14 #include "chrome/browser/bookmarks/bookmark_model_factory.h"	13 #include "chrome/browser/bookmarks/bookmark_model_factory.h"

15 #include "chrome/browser/bookmarks/chrome_bookmark_client.h"	14 #include "chrome/browser/bookmarks/chrome_bookmark_client.h"

16 #include "chrome/browser/bookmarks/chrome_bookmark_client_factory.h"	15 #include "chrome/browser/bookmarks/chrome_bookmark_client_factory.h"

17 #include "chrome/browser/profiles/profile.h"	16 #include "chrome/browser/profiles/profile.h"

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

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

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

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

22 #import "chrome/browser/ui/cocoa/browser_window_controller.h"	21 #import "chrome/browser/ui/cocoa/browser_window_controller.h"

(...skipping 691 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
714 }	713 }

715	714

716 // Implementing isEqual: allows the NSTreeController to preserve the selection	715 // Implementing isEqual: allows the NSTreeController to preserve the selection

717 // and open/shut state of outline items when the data changes.	716 // and open/shut state of outline items when the data changes.

718 - (BOOL)isEqual:(id)other {	717 - (BOOL)isEqual:(id)other {

719 return [other isKindOfClass:[BookmarkFolderInfo class]] &&	718 return [other isKindOfClass:[BookmarkFolderInfo class]] &&

720 folderNode_ == [(BookmarkFolderInfo*)other folderNode];	719 folderNode_ == [(BookmarkFolderInfo*)other folderNode];

721 }	720 }

722	721

723 @end	722 @end

OLD	NEW