Fix for issue 27210, show bookmarks bar menu is out of sync with the browser's status.

chrome/browser/chromeos/status_area_view.cc

 // Copyright (c) 2009 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/chromeos/status_area_view.h"
 
 #include <algorithm>
 
 #include "app/gfx/canvas.h"
 #include "app/l10n_util.h"
 #include "app/theme_provider.h"
 #include "base/string_util.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/chromeos/clock_menu_button.h"
 #include "chrome/browser/chromeos/network_menu_button.h"
 #include "chrome/browser/chromeos/power_menu_button.h"
 #include "chrome/browser/chromeos/status_area_button.h"
 #if !defined(TOOLKIT_VIEWS)
 #include "chrome/browser/gtk/browser_window_gtk.h"
 #else
 #include "chrome/browser/views/frame/browser_view.h"
 #endif
 #include "chrome/browser/profile.h"
+#include "chrome/common/pref_names.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "views/controls/menu/menu.h"
 #include "views/controls/menu/simple_menu_model.h"
 
 namespace chromeos {
 
 // Number of pixels to pad on the left border.
 const int kLeftBorder = 1;
 // Number of pixels to separate the clock from the next item on the right.
 const int kClockSeparation = 4;
 
 // BrowserWindowGtk tiles its image with this offset
 const int kCustomFrameBackgroundVerticalOffset = 15;
 
 class OptionsMenuModel : public views::SimpleMenuModel,
                          public views::SimpleMenuModel::Delegate {
  public:
   // These extra command IDs must be unique when combined with the options,
   // so we just pick up the numbering where that stops.
   enum OtherCommands {
     CREATE_NEW_WINDOW = StatusAreaView::OPEN_TABS_ON_RIGHT + 1,
   };
 
-  explicit OptionsMenuModel(Browser* browser,
-                            views::SimpleMenuModel::Delegate* delegate)
+  explicit OptionsMenuModel(Browser* browser)
       : SimpleMenuModel(this),
         browser_(browser) {
 #if defined(TOOLKIT_VIEWS)
     AddItemWithStringId(IDC_COMPACT_NAVBAR, IDS_COMPACT_NAVBAR);
 #else
     AddItem(static_cast<int>(CREATE_NEW_WINDOW),
             ASCIIToUTF16("New window"));
 #endif
     AddSeparator();
 
@@ skipping 165 matching lines @@
 
 // static
 void StatusAreaView::SetOpenTabsMode(OpenTabsMode mode) {
   open_tabs_mode_ = mode;
 }
 
 void StatusAreaView::CreateAppMenu() {
   if (app_menu_contents_.get())
     return;
 
-  options_menu_contents_.reset(new OptionsMenuModel(browser_, this));
+  options_menu_contents_.reset(new OptionsMenuModel(browser_));
 
   app_menu_contents_.reset(new views::SimpleMenuModel(this));
   app_menu_contents_->AddItemWithStringId(IDC_NEW_TAB, IDS_NEW_TAB);
   app_menu_contents_->AddItemWithStringId(IDC_NEW_WINDOW, IDS_NEW_WINDOW);
   app_menu_contents_->AddItemWithStringId(IDC_NEW_INCOGNITO_WINDOW,
                                           IDS_NEW_INCOGNITO_WINDOW);
   app_menu_contents_->AddSeparator();
   app_menu_contents_->AddCheckItemWithStringId(IDC_SHOW_BOOKMARK_BAR,
                                                IDS_SHOW_BOOKMARK_BAR);
   app_menu_contents_->AddItemWithStringId(IDC_FULLSCREEN, IDS_FULLSCREEN);
@@ skipping 21 matching lines @@
   app_menu_contents_->AddItem(IDC_ABOUT,
                               l10n_util::GetStringFUTF16(
                                   IDS_ABOUT,
                                   l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
   app_menu_contents_->AddItemWithStringId(IDC_HELP_PAGE, IDS_HELP_PAGE);
 
   app_menu_menu_.reset(new views::Menu2(app_menu_contents_.get()));
 }
 
 bool StatusAreaView::IsCommandIdChecked(int command_id) const {
+  if (command_id == IDC_SHOW_BOOKMARK_BAR)
+    return browser_->profile()->GetPrefs()->GetBoolean(prefs::kShowBookmarkBar);
   return false;
 }
 
 bool StatusAreaView::IsCommandIdEnabled(int command_id) const {
   if (command_id == IDC_RESTORE_TAB)
     return browser_->CanRestoreTab();
   return browser_->command_updater()->IsCommandEnabled(command_id);
 }
 
 bool StatusAreaView::GetAcceleratorForCommandId(
     int command_id,
     views::Accelerator* accelerator) {
   return false;
 }
 
 void StatusAreaView::ExecuteCommand(int command_id) {
   browser_->ExecuteCommand(command_id);
 }
 
 void StatusAreaView::RunMenu(views::View* source, const gfx::Point& pt) {
   CreateAppMenu();
   app_menu_menu_->RunMenuAt(pt, views::Menu2::ALIGN_TOPRIGHT);
 }
 
 }  // namespace chromeos