GTK: Do not depend on the notification observer order...

chrome/browser/ui/gtk/browser_toolbar_gtk.cc

 // Copyright (c) 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/gtk/browser_toolbar_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 #include <X11/XF86keysym.h>
 
@@ skipping 394 matching lines @@
     UpdateRoundedness();
   } else if (type == chrome::NOTIFICATION_UPGRADE_RECOMMENDED) {
     // Redraw the wrench menu to update the badge.
     gtk_widget_queue_draw(wrench_menu_button_->widget());
   } else if (type == chrome::NOTIFICATION_GLOBAL_ERRORS_CHANGED) {
     is_wrench_menu_model_valid_ = false;
     gtk_widget_queue_draw(wrench_menu_button_->widget());
   } else if (type == content::NOTIFICATION_ZOOM_LEVEL_CHANGED) {
     // If our zoom level changed, we need to tell the menu to update its state,
     // since the menu could still be open.
     wrench_menu_->UpdateMenu();

[Lei Zhang, 2012/08/28 20:57:22]

The alternative to depending on the ordering is to just add a one-liner call to
wrench_menu_model_->UpdateZoomLevel() here. Which is certainly easier, but it
feels hacky too, since non of the other platforms re-creates their
WrenchMenuModels. Who knows what other subtle breakages re-creating
WrenchMenuModels can cause in the future?

   } else {
     NOTREACHED();
   }
 }
 
 // BrowserToolbarGtk, public ---------------------------------------------------
 
 void BrowserToolbarGtk::UpdateWebContents(WebContents* contents,
                                           bool should_restore_state) {
   location_bar_->Update(should_restore_state ? contents : NULL);
@@ skipping 228 matching lines @@
     SetUpDragForHomeButton(!home_page_.IsManaged() &&
                            !home_page_is_new_tab_page_.IsManaged());
 }
 
 bool BrowserToolbarGtk::ShouldOnlyShowLocation() const {
   // If we're a popup window, only show the location bar (omnibox).
   return !browser_->is_type_tabbed();
 }
 
 void BrowserToolbarGtk::RebuildWrenchMenu() {
-  wrench_menu_model_.reset(new WrenchMenuModel(this, browser_));
+  wrench_menu_model_->Rebuild();
   wrench_menu_.reset(new MenuGtk(this, wrench_menu_model_.get()));
   // The bookmark menu model needs to be able to force the wrench menu to close.
   wrench_menu_model_->bookmark_sub_menu_model()->SetMenuGtk(wrench_menu_.get());
   is_wrench_menu_model_valid_ = true;
 }
 
 gboolean BrowserToolbarGtk::OnWrenchMenuButtonExpose(GtkWidget* sender,
                                                      GdkEventExpose* expose) {
   TRACE_EVENT0("ui::gtk", "BrowserToolbarGtk::OnWrenchMenuButtonExpose");
   int resource_id = 0;
@@ skipping 15 matching lines @@
   const SkBitmap* badge = theme_service_->GetBitmapNamed(resource_id);
   gfx::CanvasSkiaPaint canvas(expose, false);
   int x_offset = base::i18n::IsRTL() ? 0 : allocation.width - badge->width();
   int y_offset = 0;
   canvas.DrawImageInt(*badge,
                       allocation.x + x_offset,
                       allocation.y + y_offset);
 
   return FALSE;
 }