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

Unified Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_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_bubble_controller.mm
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm
index 59999b16f16928dc62a68318b66ae6c5030a410a..1d351dd28aa2ef5badc6fd42c78ee419d220c215 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm
@@ -6,7 +6,6 @@
#include "base/mac/bundle_locations.h"
#include "base/strings/sys_string_conversions.h"
-#include "chrome/browser/bookmarks/chrome_bookmark_client.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_finder.h"
#import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h"
@@ -54,16 +53,14 @@ using bookmarks::BookmarkNode;
}
- (id)initWithParentWindow:(NSWindow*)parentWindow
- client:(ChromeBookmarkClient*)client
model:(BookmarkModel*)model
node:(const BookmarkNode*)node
alreadyBookmarked:(BOOL)alreadyBookmarked {
- DCHECK(client);
+ DCHECK(model);
DCHECK(node);
if ((self = [super initWithWindowNibPath:@"BookmarkBubble"
parentWindow:parentWindow
anchoredAt:NSZeroPoint])) {
- client_ = client;
model_ = model;
node_ = node;
alreadyBookmarked_ = alreadyBookmarked;
@@ -107,8 +104,8 @@ using bookmarks::BookmarkNode;
- (void)startPulsingBookmarkButton:(const BookmarkNode*)node {
while (node) {
if ((node->parent() == model_->bookmark_bar_node()) ||
- (node->parent() == client_->managed_node()) ||
- (node->parent() == client_->supervised_node()) ||
+ (node->parent() == model_->managed_node()) ||
+ (node->parent() == model_->supervised_node()) ||
(node == model_->other_node())) {
pulsingBookmarkNode_ = node;
bookmarkObserver_->StartObservingNode(pulsingBookmarkNode_);
@@ -380,7 +377,7 @@ using bookmarks::BookmarkNode;
for (int i = 0; i < parent->child_count(); i++) {
const BookmarkNode* child = parent->GetChild(i);
if (child->is_folder() && child->IsVisible() &&
- client_->CanBeEditedByUser(child)) {
+ model_->CanBeEditedByUser(child)) {
[self addFolderNodes:child
toPopUpButton:button
indentation:indentation];

Powered by Google App Engine
This is Rietveld 408576698