| 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_TOOLBAR_BUTTON_H_ |    5 #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_BUTTON_H_ | 
|    6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_BUTTON_H_ |    6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_BUTTON_H_ | 
|    7  |    7  | 
|    8 #include <memory> |    8 #include <memory> | 
|    9  |    9  | 
|   10 #include "base/macros.h" |   10 #include "base/macros.h" | 
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   94  |   94  | 
|   95   // Y position of mouse when left mouse button is pressed. |   95   // Y position of mouse when left mouse button is pressed. | 
|   96   int y_position_on_lbuttondown_; |   96   int y_position_on_lbuttondown_; | 
|   97  |   97  | 
|   98   // The model adapter for the drop down menu. |   98   // The model adapter for the drop down menu. | 
|   99   std::unique_ptr<views::MenuModelAdapter> menu_model_adapter_; |   99   std::unique_ptr<views::MenuModelAdapter> menu_model_adapter_; | 
|  100  |  100  | 
|  101   // Menu runner to display drop down menu. |  101   // Menu runner to display drop down menu. | 
|  102   std::unique_ptr<views::MenuRunner> menu_runner_; |  102   std::unique_ptr<views::MenuRunner> menu_runner_; | 
|  103  |  103  | 
|  104   // Controls the visual feedback for the button state. |  | 
|  105   std::unique_ptr<views::InkDropDelegate> ink_drop_delegate_; |  | 
|  106  |  | 
|  107   // A factory for tasks that show the dropdown context menu for the button. |  104   // A factory for tasks that show the dropdown context menu for the button. | 
|  108   base::WeakPtrFactory<ToolbarButton> show_menu_factory_; |  105   base::WeakPtrFactory<ToolbarButton> show_menu_factory_; | 
|  109  |  106  | 
|  110   DISALLOW_COPY_AND_ASSIGN(ToolbarButton); |  107   DISALLOW_COPY_AND_ASSIGN(ToolbarButton); | 
|  111 }; |  108 }; | 
|  112  |  109  | 
|  113 #endif  // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_BUTTON_H_ |  110 #endif  // CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_BUTTON_H_ | 
| OLD | NEW |