chrome/browser/ui/cocoa/bookmarks/bookmark_bar_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_bar_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 6 years 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 "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"	5 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"

6	6

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

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

9 #include "base/metrics/histogram.h"	8 #include "base/metrics/histogram.h"

10 #include "base/prefs/pref_service.h"	9 #include "base/prefs/pref_service.h"

11 #include "base/strings/sys_string_conversions.h"	10 #include "base/strings/sys_string_conversions.h"

12 #include "chrome/browser/bookmarks/bookmark_model_factory.h"	11 #include "chrome/browser/bookmarks/bookmark_model_factory.h"

13 #include "chrome/browser/bookmarks/bookmark_stats.h"	12 #include "chrome/browser/bookmarks/bookmark_stats.h"

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

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

16 #include "chrome/browser/prefs/incognito_mode_prefs.h"	15 #include "chrome/browser/prefs/incognito_mode_prefs.h"

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

18 #include "chrome/browser/themes/theme_properties.h"	17 #include "chrome/browser/themes/theme_properties.h"

(...skipping 2793 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
2812 - (id<BookmarkButtonControllerProtocol>)controllerForNode:	2811 - (id<BookmarkButtonControllerProtocol>)controllerForNode:

2813 (const BookmarkNode*)node {	2812 (const BookmarkNode*)node {

2814 // See if it's in the bar, then if it is in the hierarchy of visible	2813 // See if it's in the bar, then if it is in the hierarchy of visible

2815 // folder menus.	2814 // folder menus.

2816 if (bookmarkModel_->bookmark_bar_node() == node)	2815 if (bookmarkModel_->bookmark_bar_node() == node)

2817 return self;	2816 return self;

2818 return [folderController_ controllerForNode:node];	2817 return [folderController_ controllerForNode:node];

2819 }	2818 }

2820	2819

2821 @end	2820 @end

OLD	NEW