chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm - Issue 1658793002: Update chrome for new prefs location.

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 10 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_bar_bridge.mm ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_editor_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 #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 <stddef.h>	7 #include <stddef.h>

8	8

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

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

11 #include "base/metrics/histogram.h"	11 #include "base/metrics/histogram.h"

12 #include "base/prefs/pref_service.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/bookmark_stats.h"	14 #include "chrome/browser/bookmarks/bookmark_stats.h"

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

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

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

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

20 #include "chrome/browser/themes/theme_service.h"	19 #include "chrome/browser/themes/theme_service.h"

21 #import "chrome/browser/themes/theme_service_factory.h"	20 #import "chrome/browser/themes/theme_service_factory.h"

22 #include "chrome/browser/ui/bookmarks/bookmark_editor.h"	21 #include "chrome/browser/ui/bookmarks/bookmark_editor.h"

(...skipping 26 matching lines...) Expand all Loading...
49 #include "chrome/browser/ui/tabs/tab_strip_model.h"	48 #include "chrome/browser/ui/tabs/tab_strip_model.h"

50 #include "chrome/common/extensions/extension_constants.h"	49 #include "chrome/common/extensions/extension_constants.h"

51 #include "chrome/common/extensions/extension_metrics.h"	50 #include "chrome/common/extensions/extension_metrics.h"

52 #include "chrome/common/url_constants.h"	51 #include "chrome/common/url_constants.h"

53 #include "chrome/grit/generated_resources.h"	52 #include "chrome/grit/generated_resources.h"

54 #include "components/bookmarks/browser/bookmark_model.h"	53 #include "components/bookmarks/browser/bookmark_model.h"

55 #include "components/bookmarks/browser/bookmark_node_data.h"	54 #include "components/bookmarks/browser/bookmark_node_data.h"

56 #include "components/bookmarks/browser/bookmark_utils.h"	55 #include "components/bookmarks/browser/bookmark_utils.h"

57 #include "components/bookmarks/common/bookmark_pref_names.h"	56 #include "components/bookmarks/common/bookmark_pref_names.h"

58 #include "components/bookmarks/managed/managed_bookmark_service.h"	57 #include "components/bookmarks/managed/managed_bookmark_service.h"

	58 #include "components/prefs/pref_service.h"

59 #include "content/public/browser/user_metrics.h"	59 #include "content/public/browser/user_metrics.h"

60 #include "content/public/browser/web_contents.h"	60 #include "content/public/browser/web_contents.h"

61 #include "extensions/browser/extension_registry.h"	61 #include "extensions/browser/extension_registry.h"

62 #include "extensions/common/extension.h"	62 #include "extensions/common/extension.h"

63 #include "extensions/common/extension_set.h"	63 #include "extensions/common/extension_set.h"

64 #include "grit/theme_resources.h"	64 #include "grit/theme_resources.h"

65 #import "ui/base/cocoa/cocoa_base_utils.h"	65 #import "ui/base/cocoa/cocoa_base_utils.h"

66 #include "ui/base/l10n/l10n_util_mac.h"	66 #include "ui/base/l10n/l10n_util_mac.h"

67 #include "ui/base/resource/resource_bundle.h"	67 #include "ui/base/resource/resource_bundle.h"

68 #include "ui/gfx/image/image.h"	68 #include "ui/gfx/image/image.h"

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

2946 (const BookmarkNode*)node {	2946 (const BookmarkNode*)node {

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

2948 // folder menus.	2948 // folder menus.

2949 if (bookmarkModel_->bookmark_bar_node() == node)	2949 if (bookmarkModel_->bookmark_bar_node() == node)

2950 return self;	2950 return self;

2951 return [folderController_ controllerForNode:node];	2951 return [folderController_ controllerForNode:node];

2952 }	2952 }

2953	2953

2954 @end	2954 @end

OLD	NEW