Use BrowserCommandController's logic uniformly for bookmark command enable/disable

chrome/browser/ui/browser.cc

 // Copyright 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/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // defined(OS_WIN)
@@ skipping 1996 matching lines @@
   // SHAppBarMessage, which internally spawns a nested message loop.This
   // makes it possible for us to end up here before window creation has
   // completed, at which point window_ is NULL. See 94752 for details.
 
   if (window() && window()->GetLocationBar())
     window()->GetLocationBar()->UpdatePageActions();
 }
 
 void Browser::OnExtensionLoaded(content::BrowserContext* browser_context,
                                 const extensions::Extension* extension) {
-  chrome::UpdateCommandEnabled(
-      this,
-      IDC_BOOKMARK_PAGE,
-      !chrome::ShouldRemoveBookmarkThisPageUI(profile_));
-  chrome::UpdateCommandEnabled(
-      this,
-      IDC_BOOKMARK_ALL_TABS,
-      !chrome::ShouldRemoveBookmarkOpenPagesUI(profile_));
+  command_controller_->ExtensionStateChanged();
 }
 
 void Browser::OnExtensionUnloaded(
     content::BrowserContext* browser_context,
     const extensions::Extension* extension,
     extensions::UnloadedExtensionInfo::Reason reason) {
-  chrome::UpdateCommandEnabled(
-      this,
-      IDC_BOOKMARK_PAGE,
-      !chrome::ShouldRemoveBookmarkThisPageUI(profile_));
-  chrome::UpdateCommandEnabled(
-      this,
-      IDC_BOOKMARK_ALL_TABS,
-      !chrome::ShouldRemoveBookmarkOpenPagesUI(profile_));
+  command_controller_->ExtensionStateChanged();
   if (window()->GetLocationBar())
     window()->GetLocationBar()->UpdatePageActions();
 
   // Close any tabs from the unloaded extension, unless it's terminated,
   // in which case let the sad tabs remain.
   if (reason != extensions::UnloadedExtensionInfo::REASON_TERMINATE) {
     // Iterate backwards as we may remove items while iterating.
     for (int i = tab_strip_model_->count() - 1; i >= 0; --i) {
       WebContents* web_contents = tab_strip_model_->GetWebContentsAt(i);
       // Two cases are handled here:
@@ skipping 473 matching lines @@
   if (contents && !allow_js_access) {
     contents->web_contents()->GetController().LoadURL(
         target_url,
         content::Referrer(),
         ui::PAGE_TRANSITION_LINK,
         std::string());  // No extra headers.
   }
 
   return contents != NULL;
 }