chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.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_editor_base_controller.mm

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

Patch Set: Fix "gn check" and compilation on Mac 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

« no previous file with comments | « chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 4034a8b05babb60be2350c91eb87ba016b80956c..3dd838c1baac6313e671f4330a75f025fef7d46e 100644

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

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

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

#include "base/mac/bundle_locations.h"

#include "base/strings/sys_string_conversions.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/profiles/profile.h"

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

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

@@ -21,6 +20,7 @@

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

#include "chrome/grit/generated_resources.h"

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

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

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

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

@@ -505,14 +505,14 @@ NSString* const kOkEnabledName = @"okEnabled";

}

- (NSMutableArray*)addChildFoldersFromNode:(const BookmarkNode*)node {

- ChromeBookmarkClient* client =

- ChromeBookmarkClientFactory::GetForProfile(profile_);

+ bookmarks::ManagedBookmarkService* managed =

+ ManagedBookmarkServiceFactory::GetForProfile(profile_);

NSMutableArray* childFolders = nil;

int childCount = node->child_count();

for (int i = 0; i < childCount; ++i) {

const BookmarkNode* childNode = node->GetChild(i);

if (childNode->is_folder() && childNode->IsVisible() &&

- client->CanBeEditedByUser(childNode)) {

+ managed->CanBeEditedByUser(childNode)) {

NSString* childName = base::SysUTF16ToNSString(childNode->GetTitle());

NSMutableArray* children = [self addChildFoldersFromNode:childNode];

BookmarkFolderInfo* folderInfo =