Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8645)

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

Issue 1203713002: Limit access to ChromeBookmarkClient to bookmarks code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cleanup_bookmark_client
Patch Set: Rebase Created 5 years, 6 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
Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm
index ca1997740c1e134a73cc59f7e82fdbea52d9115d..f0ef2e6badf040404da053009cee90777dd33752 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm
@@ -7,8 +7,6 @@
#include "base/mac/bundle_locations.h"
#include "base/strings/sys_string_conversions.h"
#import "chrome/browser/bookmarks/bookmark_model_factory.h"
-#import "chrome/browser/bookmarks/chrome_bookmark_client.h"
-#import "chrome/browser/bookmarks/chrome_bookmark_client_factory.h"
#import "chrome/browser/profiles/profile.h"
#import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h"
#import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
@@ -1272,11 +1270,10 @@ static BOOL ValueInRangeInclusive(CGFloat low, CGFloat value, CGFloat high) {
destIndex += [[parentButton_ cell] startingChildIndex];
}
- ChromeBookmarkClient* client =
- ChromeBookmarkClientFactory::GetForProfile(profile_);
- if (!client->CanBeEditedByUser(destParent))
+ BookmarkModel* bookmarkModel = [self bookmarkModel];
+ if (!bookmarkModel->CanBeEditedByUser(destParent))
return NO;
- if (!client->CanBeEditedByUser(sourceNode))
+ if (!bookmarkModel->CanBeEditedByUser(sourceNode))
copy = YES;
// Prevent cycles.
@@ -1842,9 +1839,8 @@ static BOOL ValueInRangeInclusive(CGFloat low, CGFloat value, CGFloat high) {
destIndex += [[parentButton_ cell] startingChildIndex];
}
- ChromeBookmarkClient* client =
- ChromeBookmarkClientFactory::GetForProfile(profile_);
- if (!client->CanBeEditedByUser(destParent))
+ BookmarkModel* bookmarkModel = [self bookmarkModel];
+ if (!bookmarkModel->CanBeEditedByUser(destParent))
return NO;
// Create and add the new bookmark nodes.

Powered by Google App Engine
This is Rietveld 408576698