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

Unified Diff: chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc

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
Index: chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc
diff --git a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc
index 92ab0faed3654b5112ac632782f6e10250a2c579..7bc0256e156edaa64eb515de3b929ab85054e2ed 100644
--- a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc
+++ b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.cc
@@ -9,8 +9,7 @@
#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"
@@ -25,6 +24,7 @@
#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"
@@ -320,10 +320,10 @@ base::string16 BookmarkContextMenuController::GetLabelForCommandId(
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();
@@ -417,9 +417,9 @@ 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;
« no previous file with comments | « chrome/browser/sync/test/integration/bookmarks_helper.cc ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698