| 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 "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "base/memory/weak_ptr.h" | 10 #include "base/memory/weak_ptr.h" |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 // Sets |margin_trailing_| when the browser is maximized and updates layout | 63 // Sets |margin_trailing_| when the browser is maximized and updates layout |
| 64 // to make the focus rectangle centered. | 64 // to make the focus rectangle centered. |
| 65 void SetTrailingMargin(int margin); | 65 void SetTrailingMargin(int margin); |
| 66 | 66 |
| 67 // Opens the app menu immediately during a drag-and-drop operation. | 67 // Opens the app menu immediately during a drag-and-drop operation. |
| 68 // Used only in testing. | 68 // Used only in testing. |
| 69 static bool g_open_app_immediately_for_testing; | 69 static bool g_open_app_immediately_for_testing; |
| 70 | 70 |
| 71 private: | 71 private: |
| 72 // views::MenuButton: | 72 // views::MenuButton: |
| 73 void AddInkDropLayer(ui::Layer* ink_drop_layer) override; | |
| 74 void RemoveInkDropLayer(ui::Layer* ink_drop_layer) override; | |
| 75 gfx::Point GetInkDropCenter() const override; | 73 gfx::Point GetInkDropCenter() const override; |
| 76 | 74 |
| 77 // views::MenuButton: | 75 // views::MenuButton: |
| 78 const char* GetClassName() const override; | 76 const char* GetClassName() const override; |
| 79 scoped_ptr<views::LabelButtonBorder> CreateDefaultBorder() const override; | 77 scoped_ptr<views::LabelButtonBorder> CreateDefaultBorder() const override; |
| 80 gfx::Rect GetThemePaintRect() const override; | 78 gfx::Rect GetThemePaintRect() const override; |
| 81 bool GetDropFormats( | 79 bool GetDropFormats( |
| 82 int* formats, | 80 int* formats, |
| 83 std::set<ui::Clipboard::FormatType>* format_types) override; | 81 std::set<ui::Clipboard::FormatType>* format_types) override; |
| 84 bool AreDropTypesRequired() override; | 82 bool AreDropTypesRequired() override; |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 // Controls the visual feedback for the button state. | 120 // Controls the visual feedback for the button state. |
| 123 scoped_ptr<views::InkDropDelegate> ink_drop_delegate_; | 121 scoped_ptr<views::InkDropDelegate> ink_drop_delegate_; |
| 124 | 122 |
| 125 // Used to spawn weak pointers for delayed tasks to open the overflow menu. | 123 // Used to spawn weak pointers for delayed tasks to open the overflow menu. |
| 126 base::WeakPtrFactory<AppMenuButton> weak_factory_; | 124 base::WeakPtrFactory<AppMenuButton> weak_factory_; |
| 127 | 125 |
| 128 DISALLOW_COPY_AND_ASSIGN(AppMenuButton); | 126 DISALLOW_COPY_AND_ASSIGN(AppMenuButton); |
| 129 }; | 127 }; |
| 130 | 128 |
| 131 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_APP_MENU_BUTTON_H_ | 129 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_APP_MENU_BUTTON_H_ |
| OLD | NEW |