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

chrome/browser/ui/toolbar/wrench_menu_model.cc

Index: chrome/browser/ui/toolbar/wrench_menu_model.cc
===================================================================
--- chrome/browser/ui/toolbar/wrench_menu_model.cc	(revision 153513)
+++ chrome/browser/ui/toolbar/wrench_menu_model.cc	(working copy)
@@ -6,8 +6,8 @@
 
 #include <algorithm>
 #include <cmath>
+#include <string>
 
-#include "base/command_line.h"
 #include "base/i18n/number_formatting.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
@@ -39,7 +39,6 @@
 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h"
 #include "chrome/browser/upgrade_detector.h"
 #include "chrome/common/chrome_paths.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/profiling.h"
 #include "content/public/browser/host_zoom_map.h"
@@ -63,6 +62,11 @@
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #endif
 
+#if defined(OS_CHROMEOS)
+#include "base/command_line.h"
+#include "chrome/common/chrome_switches.h"
+#endif
+
 #if defined(OS_WIN)
 #include "base/win/metro.h"
 #include "base/win/windows_version.h"
@@ -687,6 +691,14 @@
       IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent));
 }
 
+#if defined(TOOLKIT_GTK)
+void WrenchMenuModel::Rebuild() {
+  Clear();

[Lei Zhang, 2012/08/28 06:41:00]

SimpleMenu::Clear() says, "Note that it does not free MenuModel of submenu." Am
I missing some cleanup here?

+  Build();
+  UpdateZoomControls();
+}
+#endif
+
 string16 WrenchMenuModel::GetSyncMenuLabel() const {
   Profile* profile = browser_->profile()->GetOriginalProfile();
   return sync_ui_util::GetSyncMenuLabel(