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

Side by Side Diff: ui/message_center/views/notification_header_view.h

Issue 2959363002: Add ripple effect to new-style notification header. (Closed)
Patch Set: Resolve review comments. Created 3 years, 5 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 unified diff | Download patch
OLDNEW
1 // Copyright 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 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 UI_MESSAGE_CENTER_VIEWS_NOTIFICATION_HEADER_VIEW_H_ 5 #ifndef UI_MESSAGE_CENTER_VIEWS_NOTIFICATION_HEADER_VIEW_H_
6 #define UI_MESSAGE_CENTER_VIEWS_NOTIFICATION_HEADER_VIEW_H_ 6 #define UI_MESSAGE_CENTER_VIEWS_NOTIFICATION_HEADER_VIEW_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "ui/message_center/views/padded_button.h" 9 #include "ui/message_center/views/padded_button.h"
10 #include "ui/views/controls/button/custom_button.h" 10 #include "ui/views/controls/button/custom_button.h"
(...skipping 14 matching lines...) Expand all
25 void SetExpandButtonEnabled(bool enabled); 25 void SetExpandButtonEnabled(bool enabled);
26 void SetExpanded(bool expanded); 26 void SetExpanded(bool expanded);
27 void SetSettingsButtonEnabled(bool enabled); 27 void SetSettingsButtonEnabled(bool enabled);
28 void SetCloseButtonEnabled(bool enabled); 28 void SetCloseButtonEnabled(bool enabled);
29 void SetControlButtonsVisible(bool visible); 29 void SetControlButtonsVisible(bool visible);
30 bool IsExpandButtonEnabled(); 30 bool IsExpandButtonEnabled();
31 bool IsSettingsButtonEnabled(); 31 bool IsSettingsButtonEnabled();
32 bool IsCloseButtonEnabled(); 32 bool IsCloseButtonEnabled();
33 bool IsCloseButtonFocused(); 33 bool IsCloseButtonFocused();
34 34
35 std::unique_ptr<views::InkDrop> CreateInkDrop() override;
yoshiki 2017/06/29 08:09:06 nit: This class is mix of inherited and original m
tetsui 2017/06/29 11:35:52 Done.
36 std::unique_ptr<views::InkDropRipple> CreateInkDropRipple() const override;
37 std::unique_ptr<views::InkDropHighlight> CreateInkDropHighlight()
38 const override;
39
35 views::ImageButton* expand_button() { return expand_button_; } 40 views::ImageButton* expand_button() { return expand_button_; }
36 views::ImageButton* settings_button() { return settings_button_; } 41 views::ImageButton* settings_button() { return settings_button_; }
37 views::ImageButton* close_button() { return close_button_; } 42 views::ImageButton* close_button() { return close_button_; }
38 43
39 private: 44 private:
40 void UpdateControlButtonsVisibility(); 45 void UpdateControlButtonsVisibility();
41 46
42 views::Label* app_name_view_ = nullptr; 47 views::Label* app_name_view_ = nullptr;
43 views::ImageView* app_icon_view_ = nullptr; 48 views::ImageView* app_icon_view_ = nullptr;
44 views::ImageButton* expand_button_ = nullptr; 49 views::ImageButton* expand_button_ = nullptr;
45 PaddedButton* settings_button_ = nullptr; 50 PaddedButton* settings_button_ = nullptr;
46 PaddedButton* close_button_ = nullptr; 51 PaddedButton* close_button_ = nullptr;
47 52
48 bool settings_button_enabled_ = false; 53 bool settings_button_enabled_ = false;
49 bool close_button_enabled_ = false; 54 bool close_button_enabled_ = false;
50 bool is_control_buttons_visible_ = false; 55 bool is_control_buttons_visible_ = false;
51 56
52 DISALLOW_COPY_AND_ASSIGN(NotificationHeaderView); 57 DISALLOW_COPY_AND_ASSIGN(NotificationHeaderView);
53 }; 58 };
54 59
55 } // namespace message_center 60 } // namespace message_center
56 61
57 #endif // UI_MESSAGE_CENTER_VIEWS_NOTIFICATION_HEADER_VIEW_H_ 62 #endif // UI_MESSAGE_CENTER_VIEWS_NOTIFICATION_HEADER_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698