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

Side by Side Diff: ui/arc/notification/arc_custom_notification_view.h

Issue 2120593002: arc: Fix custom notification crash on closing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_ARC_NOTIFICATION_ARC_CUSTOM_NOTIFICATION_VIEW_H_ 5 #ifndef UI_ARC_NOTIFICATION_ARC_CUSTOM_NOTIFICATION_VIEW_H_
6 #define UI_ARC_NOTIFICATION_ARC_CUSTOM_NOTIFICATION_VIEW_H_ 6 #define UI_ARC_NOTIFICATION_ARC_CUSTOM_NOTIFICATION_VIEW_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 10
(...skipping 28 matching lines...) Expand all
39 void ViewHierarchyChanged( 39 void ViewHierarchyChanged(
40 const ViewHierarchyChangedDetails& details) override; 40 const ViewHierarchyChangedDetails& details) override;
41 void Layout() override; 41 void Layout() override;
42 42
43 // views::ButtonListener 43 // views::ButtonListener
44 void ButtonPressed(views::Button* sender, const ui::Event& event) override; 44 void ButtonPressed(views::Button* sender, const ui::Event& event) override;
45 45
46 // ArcCustomNotificationItem::Observer 46 // ArcCustomNotificationItem::Observer
47 void OnItemDestroying() override; 47 void OnItemDestroying() override;
48 void OnItemPinnedChanged() override; 48 void OnItemPinnedChanged() override;
49 void OnItemNotificationSurfaceRemoved() override;
49 50
50 ArcCustomNotificationItem* item_; 51 ArcCustomNotificationItem* item_;
51 exo::NotificationSurface* const surface_; 52 exo::NotificationSurface* surface_;
52 53
53 // A close button on top of NotificationSurface. Needed because the 54 // A close button on top of NotificationSurface. Needed because the
54 // aura::Window of NotificationSurface is added after hosting widget's 55 // aura::Window of NotificationSurface is added after hosting widget's
55 // RootView thus standard notification close button is always below 56 // RootView thus standard notification close button is always below
56 // it. 57 // it.
57 std::unique_ptr<views::Widget> floating_close_button_widget_; 58 std::unique_ptr<views::Widget> floating_close_button_widget_;
58 59
59 views::ImageButton* floating_close_button_ = nullptr; 60 views::ImageButton* floating_close_button_ = nullptr;
60 61
61 DISALLOW_COPY_AND_ASSIGN(ArcCustomNotificationView); 62 DISALLOW_COPY_AND_ASSIGN(ArcCustomNotificationView);
62 }; 63 };
63 64
64 } // namespace arc 65 } // namespace arc
65 66
66 #endif // UI_ARC_NOTIFICATION_ARC_CUSTOM_NOTIFICATION_VIEW_H_ 67 #endif // UI_ARC_NOTIFICATION_ARC_CUSTOM_NOTIFICATION_VIEW_H_
OLDNEW
« no previous file with comments | « ui/arc/notification/arc_custom_notification_item.cc ('k') | ui/arc/notification/arc_custom_notification_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698