| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CHROME_BROWSER_UI_TOOLBAR_WRENCH_MENU_MODEL_H_ | 5 #ifndef CHROME_BROWSER_UI_TOOLBAR_WRENCH_MENU_MODEL_H_ |
| 6 #define CHROME_BROWSER_UI_TOOLBAR_WRENCH_MENU_MODEL_H_ | 6 #define CHROME_BROWSER_UI_TOOLBAR_WRENCH_MENU_MODEL_H_ |
| 7 | 7 |
| 8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" | 10 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" |
| (...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 void Build(bool is_new_menu); | 147 void Build(bool is_new_menu); |
| 148 | 148 |
| 149 void AddGlobalErrorMenuItems(); | 149 void AddGlobalErrorMenuItems(); |
| 150 | 150 |
| 151 // Appends everything needed for the clipboard menu: a menu break, the | 151 // Appends everything needed for the clipboard menu: a menu break, the |
| 152 // clipboard menu content and the finalizing menu break. If the last break | 152 // clipboard menu content and the finalizing menu break. If the last break |
| 153 // is not needed it can be suppressed by setting |new_menu| | 153 // is not needed it can be suppressed by setting |new_menu| |
| 154 // to false. | 154 // to false. |
| 155 void CreateCutCopyPasteMenu(bool new_menu); | 155 void CreateCutCopyPasteMenu(bool new_menu); |
| 156 | 156 |
| 157 // Add a menu item for the extension icons. |
| 158 void CreateExtensionToolbarOverflowMenu(); |
| 159 |
| 157 // Appends everything needed for the zoom menu: a menu break, then the zoom | 160 // Appends everything needed for the zoom menu: a menu break, then the zoom |
| 158 // menu content and then another menu break. If the new menu type is used, | 161 // menu content and then another menu break. If the new menu type is used, |
| 159 // |new_menu| should be set to true. | 162 // |new_menu| should be set to true. |
| 160 void CreateZoomMenu(bool new_menu); | 163 void CreateZoomMenu(bool new_menu); |
| 161 | 164 |
| 162 void OnZoomLevelChanged(const content::HostZoomMap::ZoomLevelChange& change); | 165 void OnZoomLevelChanged(const content::HostZoomMap::ZoomLevelChange& change); |
| 163 | 166 |
| 164 bool ShouldShowNewIncognitoWindowMenuItem(); | 167 bool ShouldShowNewIncognitoWindowMenuItem(); |
| 165 | 168 |
| 166 // Models for the special menu items with buttons. | 169 // Models for the special menu items with buttons. |
| (...skipping 22 matching lines...) Expand all Loading... |
| 189 Browser* browser_; // weak | 192 Browser* browser_; // weak |
| 190 TabStripModel* tab_strip_model_; // weak | 193 TabStripModel* tab_strip_model_; // weak |
| 191 | 194 |
| 192 scoped_ptr<content::HostZoomMap::Subscription> zoom_subscription_; | 195 scoped_ptr<content::HostZoomMap::Subscription> zoom_subscription_; |
| 193 content::NotificationRegistrar registrar_; | 196 content::NotificationRegistrar registrar_; |
| 194 | 197 |
| 195 DISALLOW_COPY_AND_ASSIGN(WrenchMenuModel); | 198 DISALLOW_COPY_AND_ASSIGN(WrenchMenuModel); |
| 196 }; | 199 }; |
| 197 | 200 |
| 198 #endif // CHROME_BROWSER_UI_TOOLBAR_WRENCH_MENU_MODEL_H_ | 201 #endif // CHROME_BROWSER_UI_TOOLBAR_WRENCH_MENU_MODEL_H_ |
| OLD | NEW |