chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm - Issue 1233673002: Fix componentization of chrome/browser/bookmarks

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

Unified Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm

Issue 1233673002: Fix componentization of chrome/browser/bookmarks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address comments by tfarina and fix compilation Created 5 years, 5 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.h ('K') | « chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm ('k') | chrome/browser/ui/cocoa/browser_window_controller.mm » ('j') | components/bookmarks/managed/managed_bookmark_service.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm

diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm

index ef810682151951e6a12aa6f6c100fc459b722c89..74fc155be5f0053b30c4627504814780bc24b18b 100644

--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm

+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm

@@ -8,8 +8,7 @@

#include "chrome/app/chrome_command_ids.h"

#import "chrome/browser/app_controller_mac.h"

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

-#include "chrome/browser/bookmarks/chrome_bookmark_client.h"

-#include "chrome/browser/bookmarks/chrome_bookmark_client_factory.h"

+#include "chrome/browser/bookmarks/managed_bookmark_service_factory.h"

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

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

#include "chrome/browser/profiles/profile_manager.h"

@@ -18,6 +17,7 @@

#import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h"

#include "chrome/grit/generated_resources.h"

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

+#include "components/bookmarks/managed/managed_bookmark_service.h"

#include "grit/theme_resources.h"

#include "ui/base/l10n/l10n_util.h"

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

@@ -76,11 +76,11 @@ void BookmarkMenuBridge::UpdateMenuInternal(NSMenu* bookmark_menu,

// Add at most one separator for the bookmark bar and the managed and

// supervised bookmarks folders.

- ChromeBookmarkClient* client =

- ChromeBookmarkClientFactory::GetForProfile(profile_);

+ bookmarks::ManagedBookmarkService* managed =

+ ManagedBookmarkServiceFactory::GetForProfile(profile_);

const BookmarkNode* barNode = model->bookmark_bar_node();

- const BookmarkNode* managedNode = client->managed_node();

- const BookmarkNode* supervisedNode = client->supervised_node();

+ const BookmarkNode* managedNode = managed->managed_node();

+ const BookmarkNode* supervisedNode = managed->supervised_node();

if (!barNode->empty() || !managedNode->empty() || !supervisedNode->empty())

[bookmark_menu addItem:[NSMenuItem separatorItem]];

if (!managedNode->empty()) {