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

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

Issue 2480353008: cros system menu - fix back and settings buttons in IME detailed view. (Closed)
Patch Set: lockdown 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_TRAY_DETAILS_VIEW_H_ 5 #ifndef ASH_COMMON_SYSTEM_TRAY_TRAY_DETAILS_VIEW_H_
6 #define ASH_COMMON_SYSTEM_TRAY_TRAY_DETAILS_VIEW_H_ 6 #define ASH_COMMON_SYSTEM_TRAY_TRAY_DETAILS_VIEW_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/common/system/tray/special_popup_row.h" 9 #include "ash/common/system/tray/special_popup_row.h"
10 #include "ash/common/system/tray/view_click_listener.h" 10 #include "ash/common/system/tray/view_click_listener.h"
(...skipping 16 matching lines...) Expand all
27 class SystemTrayItem; 27 class SystemTrayItem;
28 28
29 class ASH_EXPORT TrayDetailsView : public views::View, 29 class ASH_EXPORT TrayDetailsView : public views::View,
30 public ViewClickListener, 30 public ViewClickListener,
31 public views::ButtonListener { 31 public views::ButtonListener {
32 public: 32 public:
33 explicit TrayDetailsView(SystemTrayItem* owner); 33 explicit TrayDetailsView(SystemTrayItem* owner);
34 ~TrayDetailsView() override; 34 ~TrayDetailsView() override;
35 35
36 // ViewClickListener: 36 // ViewClickListener:
37 void OnViewClicked(views::View* sender) override; 37 // Don't override this --- override HandleViewClicked.
38 void OnViewClicked(views::View* sender) final;
38 39
39 // views::ButtonListener: 40 // views::ButtonListener:
40 void ButtonPressed(views::Button* sender, const ui::Event& event) override; 41 // Don't override this --- override HandleButtonPressed.
42 void ButtonPressed(views::Button* sender, const ui::Event& event) final;
41 43
42 SystemTrayItem* owner() { return owner_; } 44 SystemTrayItem* owner() { return owner_; }
43 SpecialPopupRow* title_row() { return title_row_; } 45 SpecialPopupRow* title_row() { return title_row_; }
44 FixedSizedScrollView* scroller() { return scroller_; } 46 FixedSizedScrollView* scroller() { return scroller_; }
45 views::View* scroll_content() { return scroll_content_; } 47 views::View* scroll_content() { return scroll_content_; }
46 48
47 protected: 49 protected:
48 // views::View: 50 // views::View:
49 void Layout() override; 51 void Layout() override;
50 void OnPaintBorder(gfx::Canvas* canvas) override; 52 void OnPaintBorder(gfx::Canvas* canvas) override;
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 99
98 // The back button that appears in the material design title row. Not owned. 100 // The back button that appears in the material design title row. Not owned.
99 views::Button* back_button_; 101 views::Button* back_button_;
100 102
101 DISALLOW_COPY_AND_ASSIGN(TrayDetailsView); 103 DISALLOW_COPY_AND_ASSIGN(TrayDetailsView);
102 }; 104 };
103 105
104 } // namespace ash 106 } // namespace ash
105 107
106 #endif // ASH_COMMON_SYSTEM_TRAY_TRAY_DETAILS_VIEW_H_ 108 #endif // ASH_COMMON_SYSTEM_TRAY_TRAY_DETAILS_VIEW_H_
OLDNEW
« no previous file with comments | « ash/common/system/chromeos/ime_menu/ime_list_view.cc ('k') | ash/common/system/tray/tray_details_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698