Fix componentization of chrome/browser/bookmarks

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
 
 #include "base/mac/bundle_locations.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/bookmarks/bookmark_stats.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/themes/theme_properties.h"
 #include "chrome/browser/themes/theme_service.h"
 #import "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/bookmarks/bookmark_editor.h"
 #include "chrome/browser/ui/bookmarks/bookmark_utils.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/chrome_pages.h"
@@ skipping 19 matching lines @@
 #import "chrome/browser/ui/cocoa/view_resizer.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_metrics.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/browser/bookmark_node_data.h"
 #include "components/bookmarks/browser/bookmark_utils.h"
+#include "components/bookmarks/managed/managed_bookmark_service.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_set.h"
 #include "grit/theme_resources.h"
 #import "ui/base/cocoa/cocoa_base_utils.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
@@ skipping 188 matching lines @@
              delegate:(id<BookmarkBarControllerDelegate>)delegate
        resizeDelegate:(id<ViewResizer>)resizeDelegate {
   if ((self = [super initWithNibName:@"BookmarkBar"
                               bundle:base::mac::FrameworkBundle()])) {
     currentState_ = BookmarkBar::HIDDEN;
     lastState_ = BookmarkBar::HIDDEN;
 
     browser_ = browser;
     initialWidth_ = initialWidth;
     bookmarkModel_ = BookmarkModelFactory::GetForProfile(browser_->profile());
-    bookmarkClient_ =
-        ChromeBookmarkClientFactory::GetForProfile(browser_->profile());
+    managedBookmarkService_ =
+        ManagedBookmarkServiceFactory::GetForProfile(browser_->profile());
     buttons_.reset([[NSMutableArray alloc] init]);
     delegate_ = delegate;
     resizeDelegate_ = resizeDelegate;
     folderTarget_.reset(
         [[BookmarkFolderTarget alloc] initWithController:self
                                                  profile:browser_->profile()]);
 
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     folderImage_.reset(
         rb.GetNativeImageNamed(IDR_BOOKMARK_BAR_FOLDER).CopyNSImage());
@@ skipping 319 matching lines @@
   }
 
   // In general, only show the divider when it's in the normal showing state.
   return [self isInState:BookmarkBar::SHOW] ? 0 : 1;
 }
 
 - (NSImage*)faviconForNode:(const BookmarkNode*)node {
   if (!node)
     return defaultImage_;
 
-  if (node == bookmarkClient_->managed_node()) {
+  if (node == managedBookmarkService_->managed_node()) {
     // Most users never see this node, so the image is only loaded if needed.
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     return rb.GetNativeImageNamed(IDR_BOOKMARK_BAR_FOLDER_MANAGED).ToNSImage();
   }
 
-  if (node == bookmarkClient_->supervised_node()) {
+  if (node == managedBookmarkService_->supervised_node()) {
     // Most users never see this node, so the image is only loaded if needed.
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     return rb.GetNativeImageNamed(
         IDR_BOOKMARK_BAR_FOLDER_SUPERVISED).ToNSImage();
   }
 
   if (node->is_folder())
     return folderImage_;
 
   const gfx::Image& favicon = bookmarkModel_->GetFavicon(node);
   if (!favicon.IsEmpty())
     return favicon.ToNSImage();
 
   return defaultImage_;
 }
 
 - (void)closeFolderAndStopTrackingMenus {
   showFolderMenus_ = NO;
   [self closeAllBookmarkFolders];
 }
 
 - (BOOL)canEditBookmarks {
   PrefService* prefs = browser_->profile()->GetPrefs();
   return prefs->GetBoolean(bookmarks::prefs::kEditBookmarksEnabled);
 }
 
 - (BOOL)canEditBookmark:(const BookmarkNode*)node {
   // Don't allow edit/delete of the permanent nodes.
   if (node == nil || bookmarkModel_->is_permanent_node(node) ||
-      !bookmarkClient_->CanBeEditedByUser(node)) {
+      !managedBookmarkService_->CanBeEditedByUser(node)) {
     return NO;
   }
   return YES;
 }
 
 #pragma mark Actions
 
 // Helper methods called on the main thread by runMenuFlashThread.
 
 - (void)setButtonFlashStateOn:(id)sender {
@@ skipping 640 matching lines @@
   // until the end of the current event loop.
   [[button retain] autorelease];
   return button;
 }
 
 // Creates the button for "Managed Bookmarks", but does not position it.
 - (void)createManagedBookmarksButton {
   if (managedBookmarksButton_.get()) {
     // The node's title might have changed if the user signed in or out.
     // Make sure it's up to date now.
-    const BookmarkNode* node = bookmarkClient_->managed_node();
+    const BookmarkNode* node = managedBookmarkService_->managed_node();
     NSString* title = base::SysUTF16ToNSString(node->GetTitle());
     NSCell* cell = [managedBookmarksButton_ cell];
     [cell setTitle:title];
 
     // Its visibility may have changed too.
     [self setManagedBookmarksButtonVisibility];
 
     return;
   }
 
-  NSCell* cell = [self cellForBookmarkNode:bookmarkClient_->managed_node()];
+  NSCell* cell =
+      [self cellForBookmarkNode:managedBookmarkService_->managed_node()];
   managedBookmarksButton_.reset([self createCustomBookmarkButtonForCell:cell]);
   [managedBookmarksButton_ setAction:@selector(openBookmarkFolderFromButton:)];
   view_id_util::SetID(managedBookmarksButton_.get(), VIEW_ID_MANAGED_BOOKMARKS);
   [buttonView_ addSubview:managedBookmarksButton_.get()];
 
   [self setManagedBookmarksButtonVisibility];
 }
 
 // Creates the button for "Supervised Bookmarks", but does not position it.
 - (void)createSupervisedBookmarksButton {
   if (supervisedBookmarksButton_.get()) {
     // The button's already there, but its visibility may have changed.
     [self setSupervisedBookmarksButtonVisibility];
     return;
   }
 
-  NSCell* cell = [self cellForBookmarkNode:bookmarkClient_->supervised_node()];
+  NSCell* cell =
+      [self cellForBookmarkNode:managedBookmarkService_->supervised_node()];
   supervisedBookmarksButton_.reset(
       [self createCustomBookmarkButtonForCell:cell]);
   [supervisedBookmarksButton_
       setAction:@selector(openBookmarkFolderFromButton:)];
   view_id_util::SetID(supervisedBookmarksButton_.get(),
                       VIEW_ID_SUPERVISED_BOOKMARKS);
   [buttonView_ addSubview:supervisedBookmarksButton_.get()];
 
   [self setSupervisedBookmarksButtonVisibility];
 }
@@ skipping 743 matching lines @@
   if ([button isFolder]) {
     destParent = [button bookmarkNode];
     // Drop it at the end.
     destIndex = [button bookmarkNode]->child_count();
   } else {
     // Else we're dropping somewhere on the bar, so find the right spot.
     destParent = bookmarkModel_->bookmark_bar_node();
     destIndex = [self indexForDragToPoint:point];
   }
 
-  if (!bookmarkClient_->CanBeEditedByUser(destParent))
+  if (!managedBookmarkService_->CanBeEditedByUser(destParent))
     return NO;
-  if (!bookmarkClient_->CanBeEditedByUser(sourceNode))
+  if (!managedBookmarkService_->CanBeEditedByUser(sourceNode))
     copy = YES;
 
   // Be sure we don't try and drop a folder into itself.
   if (sourceNode != destParent) {
     if (copy)
       bookmarkModel_->Copy(sourceNode, destParent, destIndex);
     else
       bookmarkModel_->Move(sourceNode, destParent, destIndex);
   }
 
@@ skipping 696 matching lines @@
   if ([button isFolder]) {
     destParent = [button bookmarkNode];
     // Drop it at the end.
     destIndex = [button bookmarkNode]->child_count();
   } else {
     // Else we're dropping somewhere on the bar, so find the right spot.
     destParent = bookmarkModel_->bookmark_bar_node();
     destIndex = [self indexForDragToPoint:point];
   }
 
-  if (!bookmarkClient_->CanBeEditedByUser(destParent))
+  if (!managedBookmarkService_->CanBeEditedByUser(destParent))
     return NO;
 
   // Don't add the bookmarks if the destination index shows an error.
   if (destIndex >= 0) {
     // Create and add the new bookmark nodes.
     size_t urlCount = [urls count];
     for (size_t i = 0; i < urlCount; ++i) {
       GURL gurl;
       const char* string = [[urls objectAtIndex:i] UTF8String];
       if (string)
@@ skipping 85 matching lines @@
 - (id<BookmarkButtonControllerProtocol>)controllerForNode:
     (const BookmarkNode*)node {
   // See if it's in the bar, then if it is in the hierarchy of visible
   // folder menus.
   if (bookmarkModel_->bookmark_bar_node() == node)
     return self;
   return [folderController_ controllerForNode:node];
 }
 
 @end