Views: Rebuild wrench menu if error is added or removed

chrome/browser/ui/views/toolbar_view.cc

 // Copyright (c) 2011 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/views/toolbar_view.h"
 
 #include "base/i18n/number_formatting.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ skipping 80 matching lines @@
 ToolbarView::ToolbarView(Browser* browser)
     : model_(browser->toolbar_model()),
       back_(NULL),
       forward_(NULL),
       reload_(NULL),
       home_(NULL),
       location_bar_(NULL),
       browser_actions_(NULL),
       app_menu_(NULL),
       browser_(browser),
-      profiles_menu_contents_(NULL) {
+      profiles_menu_contents_(NULL),
+      is_wrench_menu_model_valid_(true) {
   set_id(VIEW_ID_TOOLBAR);
 
   browser_->command_updater()->AddCommandObserver(IDC_BACK, this);
   browser_->command_updater()->AddCommandObserver(IDC_FORWARD, this);
   browser_->command_updater()->AddCommandObserver(IDC_HOME, this);
 
   display_mode_ = browser->SupportsWindowFeature(Browser::FEATURE_TABSTRIP) ?
       DISPLAYMODE_NORMAL : DISPLAYMODE_LOCATION;
 
   if (!kPopupBackgroundEdge) {
@@ skipping 218 matching lines @@
   return GetWidget()->GetAccelerator(id, accel);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, views::ViewMenuDelegate implementation:
 
 void ToolbarView::RunMenu(views::View* source, const gfx::Point& /* pt */) {
   DCHECK_EQ(VIEW_ID_APP_MENU, source->id());
 
   wrench_menu_.reset(new WrenchMenu(browser_));
+
+  if (!is_wrench_menu_model_valid_) {

[sky, 2011/10/07 19:40:17]

Is this really enough? What happens if a global error is removed while the menu
is showing?

Also, I'm fine with us creating and destroying the menu each time through.
Unless there is a reason not to.

[sail, 2011/10/07 20:42:08]

I believe if the bookmark model changes while the menu is open we close the
menu. Should I do the same thing here?
Yea, that might be even simpler. When would I destroy the menu though?

+    wrench_menu_model_.reset(new WrenchMenuModel(this, browser_));
+    is_wrench_menu_model_valid_ = true;
+  }
   wrench_menu_->Init(wrench_menu_model_.get());
 
   FOR_EACH_OBSERVER(views::MenuListener, menu_listeners_, OnMenuOpened());
 
   wrench_menu_->RunMenu(app_menu_);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, LocationBarView::Delegate implementation:
 
@@ skipping 61 matching lines @@
     case chrome::NOTIFICATION_PREF_CHANGED: {
       std::string* pref_name = Details<std::string>(details).ptr();
       if (*pref_name == prefs::kShowHomeButton) {
         Layout();
         SchedulePaint();
       }
       break;
     }
     case chrome::NOTIFICATION_UPGRADE_RECOMMENDED:
     case chrome::NOTIFICATION_MODULE_INCOMPATIBILITY_BADGE_CHANGE:
+      UpdateAppMenuBadge();
+      break;
     case chrome::NOTIFICATION_GLOBAL_ERRORS_CHANGED:
+      is_wrench_menu_model_valid_ = false;
       UpdateAppMenuBadge();
       break;
     default:
       NOTREACHED();
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, ui::AcceleratorProvider implementation:
 
@@ skipping 278 matching lines @@
   app_menu_->SetHoverIcon(GetAppMenuIcon(views::CustomButton::BS_HOT));
   app_menu_->SetPushedIcon(GetAppMenuIcon(views::CustomButton::BS_PUSHED));
 }
 
 void ToolbarView::UpdateAppMenuBadge() {
   app_menu_->SetIcon(GetAppMenuIcon(views::CustomButton::BS_NORMAL));
   app_menu_->SetHoverIcon(GetAppMenuIcon(views::CustomButton::BS_HOT));
   app_menu_->SetPushedIcon(GetAppMenuIcon(views::CustomButton::BS_PUSHED));
   SchedulePaint();
 }