Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Unified Diff: ash/common/system/user/button_from_view.h

Issue 2678353005: Remove pre-MD code related to tray/menu user profiles. (Closed)
Patch Set: merge conflict Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/common/system/user/button_from_view.h
diff --git a/ash/common/system/user/button_from_view.h b/ash/common/system/user/button_from_view.h
index 46d95cf98e8089251dab0769761403f8f32dee75..caf94bf2024e687eca7ef4be5d5bb0f0026b3010 100644
--- a/ash/common/system/user/button_from_view.h
+++ b/ash/common/system/user/button_from_view.h
@@ -9,7 +9,6 @@
#include "ash/common/system/tray/tray_popup_ink_drop_style.h"
#include "base/macros.h"
-#include "ui/gfx/geometry/insets.h"
#include "ui/views/controls/button/custom_button.h"
namespace views {
@@ -26,19 +25,12 @@ class ButtonFromView : public views::CustomButton {
// |button_listener| will be informed - if provided - when a button was
// pressed. If |highlight_on_hover| is set to true, the button will be
tdanderson 2017/02/08 22:33:41 nit: remove doc about |highlight_on_hover|
Evan Stade 2017/02/09 17:45:07 Done.
// highlighted upon hover and show the accessibility caret.
- // The |tab_frame_inset| will be used to inset the blue tab frame inside the
- // button.
// An accessible label gets computed based upon descendant views of this view.
ButtonFromView(views::View* content,
views::ButtonListener* listener,
- TrayPopupInkDropStyle ink_drop_style,
- bool highlight_on_hover,
- const gfx::Insets& tab_frame_inset);
+ TrayPopupInkDropStyle ink_drop_style);
~ButtonFromView() override;
- // Called when the border should remain even in the non highlighted state.
- void ForceBorderVisible(bool show);
-
// views::View:
void OnMouseEntered(const ui::MouseEvent& event) override;
void OnMouseExited(const ui::MouseEvent& event) override;
@@ -62,30 +54,17 @@ class ButtonFromView : public views::CustomButton {
std::unique_ptr<views::InkDropMask> CreateInkDropMask() const override;
private:
- // Change the hover/active state of the "button" when the status changes.
- void ShowActive();
-
// Content of button.
views::View* content_;
// Defines the flavor of ink drop ripple/highlight that should be constructed.
TrayPopupInkDropStyle ink_drop_style_;
- // Whether button should be highligthed on hover.
- bool highlight_on_hover_;
-
// True if button is hovered.
bool button_hovered_;
tdanderson 2017/02/08 22:33:41 Looks like you can remove this member too, and I t
Evan Stade 2017/02/09 17:45:07 used for tests
- // True if the border should be always visible.
- bool show_border_;
-
- // The insets which get used for the drawn accessibility (tab) frame.
- gfx::Insets tab_frame_inset_;
-
// A separate view is necessary to hold the ink drop layer so that |this| can
- // host labels with subpixel anti-aliasing enabled. Only used for material
- // design.
+ // host labels with subpixel anti-aliasing enabled.
views::InkDropContainerView* ink_drop_container_;
std::unique_ptr<views::InkDropMask> ink_drop_mask_;

Powered by Google App Engine
This is Rietveld 408576698