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 392 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) {
+    // Since BrowserToolbarGtk create a new |wrench_menu_model_| in
+    // RebuildWrenchMenu(), the ordering of the observers of
+    // NOTIFICATION_ZOOM_LEVEL_CHANGED can change, and result in subtle bugs
+    // like http://crbug.com/118823. Rather than depending on the ordering
+    // of the notification observers, always update the WrenchMenuModel before
+    // updating the WrenchMenu.
+    wrench_menu_model_->UpdateZoomControls();
+
     // 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();
   } else {
     NOTREACHED();
   }
 }
 
 // BrowserToolbarGtk, public ---------------------------------------------------
 
@@ skipping 267 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;
 }