Chromium Code Reviews| Index: chrome/browser/ui/toolbar/wrench_menu_model.h |
| =================================================================== |
| --- chrome/browser/ui/toolbar/wrench_menu_model.h (revision 153513) |
| +++ chrome/browser/ui/toolbar/wrench_menu_model.h (working copy) |
| @@ -122,6 +122,13 @@ |
| // Calculates |zoom_label_| in response to a zoom change. |
| void UpdateZoomControls(); |
| +#if defined(TOOLKIT_GTK) |
|
sail
2012/08/28 16:46:55
I don't think you need this #ifdef.
Lei Zhang
2012/08/28 19:52:54
No other platform needs this functionality right n
sail
2012/08/28 20:42:52
I think that's ok. Even if this is unused the test
|
| + // Rebuilds the model, rather than requiring the object to be recreated. Thus |
| + // avoids having to re-add notification observers, which causes the ordering |
| + // for notifications to be non-deterministic - http://crbug.com/118823. |
|
sail
2012/08/28 16:46:55
This is kind of vague. Why does the GTK code depen
Lei Zhang
2012/08/28 19:52:54
All platform depends on the zoom notification obse
sail
2012/08/28 20:42:52
I think I understand but that still seems like a b
|
| + void Rebuild(); |
| +#endif |
| + |
| private: |
| // Testing constructor used for mocking. |
| friend class ::MockWrenchMenuModel; |
| @@ -160,7 +167,7 @@ |
| ui::AcceleratorProvider* provider_; // weak |
| Browser* browser_; // weak |
| - TabStripModel* tab_strip_model_; // weak |
| + TabStripModel* tab_strip_model_; // weak |
| content::NotificationRegistrar registrar_; |