| 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_APP_MENU_BUTTON_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_APP_MENU_BUTTON_H_ |
| 6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_APP_MENU_BUTTON_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_APP_MENU_BUTTON_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 105 // App model and menu. | 105 // App model and menu. |
| 106 // Note that the menu should be destroyed before the model it uses, so the | 106 // Note that the menu should be destroyed before the model it uses, so the |
| 107 // menu should be listed later. | 107 // menu should be listed later. |
| 108 std::unique_ptr<AppMenuModel> menu_model_; | 108 std::unique_ptr<AppMenuModel> menu_model_; |
| 109 std::unique_ptr<AppMenu> menu_; | 109 std::unique_ptr<AppMenu> menu_; |
| 110 | 110 |
| 111 // Any trailing margin to be applied. Used when the browser is in | 111 // Any trailing margin to be applied. Used when the browser is in |
| 112 // a maximized state to extend to the full window width. | 112 // a maximized state to extend to the full window width. |
| 113 int margin_trailing_; | 113 int margin_trailing_; |
| 114 | 114 |
| 115 // Controls the visual feedback for the button state. | |
| 116 std::unique_ptr<views::InkDropDelegate> ink_drop_delegate_; | |
| 117 | |
| 118 // Used to spawn weak pointers for delayed tasks to open the overflow menu. | 115 // Used to spawn weak pointers for delayed tasks to open the overflow menu. |
| 119 base::WeakPtrFactory<AppMenuButton> weak_factory_; | 116 base::WeakPtrFactory<AppMenuButton> weak_factory_; |
| 120 | 117 |
| 121 DISALLOW_COPY_AND_ASSIGN(AppMenuButton); | 118 DISALLOW_COPY_AND_ASSIGN(AppMenuButton); |
| 122 }; | 119 }; |
| 123 | 120 |
| 124 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_APP_MENU_BUTTON_H_ | 121 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_APP_MENU_BUTTON_H_ |
| OLD | NEW |