| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_VIEWS_TOOLBAR_WRENCH_MENU_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_WRENCH_MENU_H_ |
| 6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_WRENCH_MENU_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_WRENCH_MENU_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 86 ui::OSExchangeData* data) OVERRIDE; | 86 ui::OSExchangeData* data) OVERRIDE; |
| 87 virtual int GetDragOperations(views::MenuItemView* sender) OVERRIDE; | 87 virtual int GetDragOperations(views::MenuItemView* sender) OVERRIDE; |
| 88 virtual int GetMaxWidthForMenu(views::MenuItemView* menu) OVERRIDE; | 88 virtual int GetMaxWidthForMenu(views::MenuItemView* menu) OVERRIDE; |
| 89 virtual bool IsItemChecked(int command_id) const OVERRIDE; | 89 virtual bool IsItemChecked(int command_id) const OVERRIDE; |
| 90 virtual bool IsCommandEnabled(int command_id) const OVERRIDE; | 90 virtual bool IsCommandEnabled(int command_id) const OVERRIDE; |
| 91 virtual void ExecuteCommand(int command_id, int mouse_event_flags) OVERRIDE; | 91 virtual void ExecuteCommand(int command_id, int mouse_event_flags) OVERRIDE; |
| 92 virtual bool GetAccelerator(int command_id, | 92 virtual bool GetAccelerator(int command_id, |
| 93 ui::Accelerator* accelerator) const OVERRIDE; | 93 ui::Accelerator* accelerator) const OVERRIDE; |
| 94 virtual void WillShowMenu(views::MenuItemView* menu) OVERRIDE; | 94 virtual void WillShowMenu(views::MenuItemView* menu) OVERRIDE; |
| 95 virtual void WillHideMenu(views::MenuItemView* menu) OVERRIDE; | 95 virtual void WillHideMenu(views::MenuItemView* menu) OVERRIDE; |
| 96 virtual bool ShouldCloseOnDragComplete() OVERRIDE; |
| 96 | 97 |
| 97 // BaseBookmarkModelObserver overrides: | 98 // BaseBookmarkModelObserver overrides: |
| 98 virtual void BookmarkModelChanged() OVERRIDE; | 99 virtual void BookmarkModelChanged() OVERRIDE; |
| 99 | 100 |
| 100 // content::NotificationObserver overrides: | 101 // content::NotificationObserver overrides: |
| 101 virtual void Observe(int type, | 102 virtual void Observe(int type, |
| 102 const content::NotificationSource& source, | 103 const content::NotificationSource& source, |
| 103 const content::NotificationDetails& details) OVERRIDE; | 104 const content::NotificationDetails& details) OVERRIDE; |
| 104 | 105 |
| 105 private: | 106 private: |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 179 const bool use_new_menu_; | 180 const bool use_new_menu_; |
| 180 | 181 |
| 181 const bool supports_new_separators_; | 182 const bool supports_new_separators_; |
| 182 | 183 |
| 183 ObserverList<WrenchMenuObserver> observer_list_; | 184 ObserverList<WrenchMenuObserver> observer_list_; |
| 184 | 185 |
| 185 DISALLOW_COPY_AND_ASSIGN(WrenchMenu); | 186 DISALLOW_COPY_AND_ASSIGN(WrenchMenu); |
| 186 }; | 187 }; |
| 187 | 188 |
| 188 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_WRENCH_MENU_H_ | 189 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_WRENCH_MENU_H_ |
| OLD | NEW |