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

Side by Side Diff: ash/common/system/tray/actionable_view.h

Issue 2447523002: [ash-md] Added different highlighting modes to the InkDropImpl. (Closed)
Patch Set: Fixed InkDropHostView::GetInkDrop() to use CreateInkDrop(). Created 4 years, 1 month 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 unified diff | Download patch
« no previous file with comments | « ash/common/shelf/shelf_button.cc ('k') | ash/common/system/tray/actionable_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 ASH_COMMON_SYSTEM_TRAY_ACTIONABLE_VIEW_H_ 5 #ifndef ASH_COMMON_SYSTEM_TRAY_ACTIONABLE_VIEW_H_
6 #define ASH_COMMON_SYSTEM_TRAY_ACTIONABLE_VIEW_H_ 6 #define ASH_COMMON_SYSTEM_TRAY_ACTIONABLE_VIEW_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "ui/gfx/geometry/rect.h" 10 #include "ui/gfx/geometry/rect.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 // been handled and an action was performed. Returns false otherwise. 52 // been handled and an action was performed. Returns false otherwise.
53 virtual bool PerformAction(const ui::Event& event) = 0; 53 virtual bool PerformAction(const ui::Event& event) = 0;
54 54
55 // Overridden from views::CustomButton. 55 // Overridden from views::CustomButton.
56 const char* GetClassName() const override; 56 const char* GetClassName() const override;
57 bool OnKeyPressed(const ui::KeyEvent& event) override; 57 bool OnKeyPressed(const ui::KeyEvent& event) override;
58 void GetAccessibleNodeData(ui::AXNodeData* node_data) override; 58 void GetAccessibleNodeData(ui::AXNodeData* node_data) override;
59 void OnPaint(gfx::Canvas* canvas) override; 59 void OnPaint(gfx::Canvas* canvas) override;
60 void OnFocus() override; 60 void OnFocus() override;
61 void OnBlur() override; 61 void OnBlur() override;
62 std::unique_ptr<views::InkDrop> CreateInkDrop() override;
62 std::unique_ptr<views::InkDropRipple> CreateInkDropRipple() const override; 63 std::unique_ptr<views::InkDropRipple> CreateInkDropRipple() const override;
63 std::unique_ptr<views::InkDropHighlight> CreateInkDropHighlight() 64 std::unique_ptr<views::InkDropHighlight> CreateInkDropHighlight()
64 const override; 65 const override;
65 66
66 // Overridden from views::ButtonListener. 67 // Overridden from views::ButtonListener.
67 void ButtonPressed(Button* sender, const ui::Event& event) override; 68 void ButtonPressed(Button* sender, const ui::Event& event) override;
68 69
69 private: 70 private:
70 // Used by ButtonPressed() to determine whether |this| has been destroyed as a 71 // Used by ButtonPressed() to determine whether |this| has been destroyed as a
71 // result of performing the associated action. This is necessary because in 72 // result of performing the associated action. This is necessary because in
72 // the not-destroyed case ButtonPressed() uses member variables. 73 // the not-destroyed case ButtonPressed() uses member variables.
73 bool* destroyed_; 74 bool* destroyed_;
74 75
75 SystemTrayItem* owner_; 76 SystemTrayItem* owner_;
76 77
77 base::string16 accessible_name_; 78 base::string16 accessible_name_;
78 79
79 DISALLOW_COPY_AND_ASSIGN(ActionableView); 80 DISALLOW_COPY_AND_ASSIGN(ActionableView);
80 }; 81 };
81 82
82 } // namespace ash 83 } // namespace ash
83 84
84 #endif // ASH_COMMON_SYSTEM_TRAY_ACTIONABLE_VIEW_H_ 85 #endif // ASH_COMMON_SYSTEM_TRAY_ACTIONABLE_VIEW_H_
OLDNEW
« no previous file with comments | « ash/common/shelf/shelf_button.cc ('k') | ash/common/system/tray/actionable_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698