Fix componentization of chrome/browser/bookmarks

chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc

 // 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.
 
 #include "chrome/browser/ui/bookmarks/bookmark_context_menu_controller.h"
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/app/chrome_command_ids.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/ui/bookmarks/bookmark_editor.h"
 #include "chrome/browser/ui/bookmarks/bookmark_utils.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/undo/bookmark_undo_service_factory.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/bookmarks/browser/bookmark_client.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/browser/bookmark_utils.h"
+#include "components/bookmarks/managed/managed_bookmark_service.h"
 #include "components/undo/bookmark_undo_service.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/user_metrics.h"
 #include "grit/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using base::UserMetricsAction;
 using bookmarks::BookmarkNode;
 using content::PageNavigator;
 
@@ skipping 275 matching lines @@
     int command_id) const {
   if (command_id == IDC_BOOKMARK_BAR_UNDO) {
     return BookmarkUndoServiceFactory::GetForProfile(profile_)->
         undo_manager()->GetUndoLabel();
   }
   if (command_id == IDC_BOOKMARK_BAR_REDO) {
     return BookmarkUndoServiceFactory::GetForProfile(profile_)->
         undo_manager()->GetRedoLabel();
   }
   if (command_id == IDC_BOOKMARK_BAR_SHOW_MANAGED_BOOKMARKS) {
-    ChromeBookmarkClient* client =
-        ChromeBookmarkClientFactory::GetForProfile(profile_);
+    bookmarks::ManagedBookmarkService* managed =
+        ManagedBookmarkServiceFactory::GetForProfile(profile_);
     return l10n_util::GetStringFUTF16(IDS_BOOKMARK_BAR_SHOW_MANAGED_BOOKMARKS,
-                                      client->managed_node()->GetTitle());
+                                      managed->managed_node()->GetTitle());
   }
 
   NOTREACHED();
   return base::string16();
 }
 
 bool BookmarkContextMenuController::IsCommandIdChecked(int command_id) const {
   PrefService* prefs = profile_->GetPrefs();
   if (command_id == IDC_BOOKMARK_BAR_ALWAYS_SHOW)
     return prefs->GetBoolean(bookmarks::prefs::kShowBookmarkBar);
@@ skipping 73 matching lines @@
                bookmarks::CanPasteFromClipboard(model_, selection_[0])) ||
               bookmarks::CanPasteFromClipboard(model_, parent_));
   }
   return true;
 }
 
 bool BookmarkContextMenuController::IsCommandIdVisible(int command_id) const {
   if (command_id == IDC_BOOKMARK_BAR_SHOW_MANAGED_BOOKMARKS) {
     // The option to hide the Managed Bookmarks folder is only available if
     // there are any managed bookmarks configured at all.
-    ChromeBookmarkClient* client =
-        ChromeBookmarkClientFactory::GetForProfile(profile_);
-    return !client->managed_node()->empty();
+    bookmarks::ManagedBookmarkService* managed =
+        ManagedBookmarkServiceFactory::GetForProfile(profile_);
+    return !managed->managed_node()->empty();
   }
 
   return true;
 }
 
 bool BookmarkContextMenuController::GetAcceleratorForCommandId(
     int command_id,
     ui::Accelerator* accelerator) {
   return false;
 }
 
 void BookmarkContextMenuController::BookmarkModelChanged() {
   if (delegate_)
     delegate_->CloseMenu();
 }