| Index: chrome/browser/ui/browser_command_controller.cc
|
| diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc
|
| index 0f7e6686f5175be993aed998c468f78a260d8a94..c083db2c240406c4d13066f4455e93d1412fb0be 100644
|
| --- a/chrome/browser/ui/browser_command_controller.cc
|
| +++ b/chrome/browser/ui/browser_command_controller.cc
|
| @@ -206,11 +206,11 @@ BrowserCommandController::BrowserCommandController(Browser* browser)
|
| base::Bind(&BrowserCommandController::UpdateCommandsForDevTools,
|
| base::Unretained(this)));
|
| profile_pref_registrar_.Add(
|
| - prefs::kEditBookmarksEnabled,
|
| + bookmarks::prefs::kEditBookmarksEnabled,
|
| base::Bind(&BrowserCommandController::UpdateCommandsForBookmarkEditing,
|
| base::Unretained(this)));
|
| profile_pref_registrar_.Add(
|
| - prefs::kShowBookmarkBar,
|
| + bookmarks::prefs::kShowBookmarkBar,
|
| base::Bind(&BrowserCommandController::UpdateCommandsForBookmarkBar,
|
| base::Unretained(this)));
|
| profile_pref_registrar_.Add(
|
| @@ -1178,11 +1178,12 @@ void BrowserCommandController::UpdateCommandsForBookmarkEditing() {
|
| }
|
|
|
| void BrowserCommandController::UpdateCommandsForBookmarkBar() {
|
| - command_updater_.UpdateCommandEnabled(IDC_SHOW_BOOKMARK_BAR,
|
| - browser_defaults::bookmarks_enabled &&
|
| - !profile()->IsGuestSession() &&
|
| - !profile()->GetPrefs()->IsManagedPreference(prefs::kShowBookmarkBar) &&
|
| - IsShowingMainUI());
|
| + command_updater_.UpdateCommandEnabled(
|
| + IDC_SHOW_BOOKMARK_BAR,
|
| + browser_defaults::bookmarks_enabled && !profile()->IsGuestSession() &&
|
| + !profile()->GetPrefs()->IsManagedPreference(
|
| + bookmarks::prefs::kShowBookmarkBar) &&
|
| + IsShowingMainUI());
|
| }
|
|
|
| void BrowserCommandController::UpdateCommandsForFileSelectionDialogs() {
|
|
|