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 <AppKit/AppKit.h> | 5 #import <AppKit/AppKit.h> |
6 | 6 |
7 #include "base/strings/sys_string_conversions.h" | 7 #include "base/strings/sys_string_conversions.h" |
8 #include "chrome/app/chrome_command_ids.h" | 8 #include "chrome/app/chrome_command_ids.h" |
9 #import "chrome/browser/app_controller_mac.h" | 9 #import "chrome/browser/app_controller_mac.h" |
10 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 10 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
11 #include "chrome/browser/bookmarks/chrome_bookmark_client.h" | 11 #include "chrome/browser/bookmarks/managed_bookmark_service_factory.h" |
12 #include "chrome/browser/bookmarks/chrome_bookmark_client_factory.h" | |
13 #include "chrome/browser/prefs/incognito_mode_prefs.h" | 12 #include "chrome/browser/prefs/incognito_mode_prefs.h" |
14 #include "chrome/browser/profiles/profile.h" | 13 #include "chrome/browser/profiles/profile.h" |
15 #include "chrome/browser/profiles/profile_manager.h" | 14 #include "chrome/browser/profiles/profile_manager.h" |
16 #include "chrome/browser/ui/browser_list.h" | 15 #include "chrome/browser/ui/browser_list.h" |
17 #include "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h" | 16 #include "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h" |
18 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h" | 17 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h" |
19 #include "chrome/grit/generated_resources.h" | 18 #include "chrome/grit/generated_resources.h" |
20 #include "components/bookmarks/browser/bookmark_model.h" | 19 #include "components/bookmarks/browser/bookmark_model.h" |
| 20 #include "components/bookmarks/managed/managed_bookmark_service.h" |
21 #include "grit/theme_resources.h" | 21 #include "grit/theme_resources.h" |
22 #include "ui/base/l10n/l10n_util.h" | 22 #include "ui/base/l10n/l10n_util.h" |
23 #include "ui/base/resource/resource_bundle.h" | 23 #include "ui/base/resource/resource_bundle.h" |
24 #include "ui/gfx/image/image.h" | 24 #include "ui/gfx/image/image.h" |
25 #include "ui/resources/grit/ui_resources.h" | 25 #include "ui/resources/grit/ui_resources.h" |
26 | 26 |
27 using bookmarks::BookmarkModel; | 27 using bookmarks::BookmarkModel; |
28 using bookmarks::BookmarkNode; | 28 using bookmarks::BookmarkNode; |
29 | 29 |
30 BookmarkMenuBridge::BookmarkMenuBridge(Profile* profile, NSMenu* menu) | 30 BookmarkMenuBridge::BookmarkMenuBridge(Profile* profile, NSMenu* menu) |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
69 if (!folder_image_) { | 69 if (!folder_image_) { |
70 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); | 70 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); |
71 folder_image_.reset( | 71 folder_image_.reset( |
72 rb.GetNativeImageNamed(IDR_BOOKMARK_BAR_FOLDER).CopyNSImage()); | 72 rb.GetNativeImageNamed(IDR_BOOKMARK_BAR_FOLDER).CopyNSImage()); |
73 } | 73 } |
74 | 74 |
75 ClearBookmarkMenu(bookmark_menu); | 75 ClearBookmarkMenu(bookmark_menu); |
76 | 76 |
77 // Add at most one separator for the bookmark bar and the managed and | 77 // Add at most one separator for the bookmark bar and the managed and |
78 // supervised bookmarks folders. | 78 // supervised bookmarks folders. |
79 ChromeBookmarkClient* client = | 79 bookmarks::ManagedBookmarkService* managed = |
80 ChromeBookmarkClientFactory::GetForProfile(profile_); | 80 ManagedBookmarkServiceFactory::GetForProfile(profile_); |
81 const BookmarkNode* barNode = model->bookmark_bar_node(); | 81 const BookmarkNode* barNode = model->bookmark_bar_node(); |
82 const BookmarkNode* managedNode = client->managed_node(); | 82 const BookmarkNode* managedNode = managed->managed_node(); |
83 const BookmarkNode* supervisedNode = client->supervised_node(); | 83 const BookmarkNode* supervisedNode = managed->supervised_node(); |
84 if (!barNode->empty() || !managedNode->empty() || !supervisedNode->empty()) | 84 if (!barNode->empty() || !managedNode->empty() || !supervisedNode->empty()) |
85 [bookmark_menu addItem:[NSMenuItem separatorItem]]; | 85 [bookmark_menu addItem:[NSMenuItem separatorItem]]; |
86 if (!managedNode->empty()) { | 86 if (!managedNode->empty()) { |
87 // Most users never see this node, so the image is only loaded if needed. | 87 // Most users never see this node, so the image is only loaded if needed. |
88 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); | 88 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); |
89 NSImage* image = | 89 NSImage* image = |
90 rb.GetNativeImageNamed(IDR_BOOKMARK_BAR_FOLDER_MANAGED).ToNSImage(); | 90 rb.GetNativeImageNamed(IDR_BOOKMARK_BAR_FOLDER_MANAGED).ToNSImage(); |
91 AddNodeAsSubmenu(bookmark_menu, managedNode, image, !is_submenu); | 91 AddNodeAsSubmenu(bookmark_menu, managedNode, image, !is_submenu); |
92 } | 92 } |
93 if (!supervisedNode->empty()) { | 93 if (!supervisedNode->empty()) { |
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
361 | 361 |
362 NSMenuItem* BookmarkMenuBridge::MenuItemForNode(const BookmarkNode* node) { | 362 NSMenuItem* BookmarkMenuBridge::MenuItemForNode(const BookmarkNode* node) { |
363 if (!node) | 363 if (!node) |
364 return nil; | 364 return nil; |
365 std::map<const BookmarkNode*, NSMenuItem*>::iterator it = | 365 std::map<const BookmarkNode*, NSMenuItem*>::iterator it = |
366 bookmark_nodes_.find(node); | 366 bookmark_nodes_.find(node); |
367 if (it == bookmark_nodes_.end()) | 367 if (it == bookmark_nodes_.end()) |
368 return nil; | 368 return nil; |
369 return it->second; | 369 return it->second; |
370 } | 370 } |
OLD | NEW |