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

Side by Side Diff: ash/system/tray/tray_item_more.h

Issue 10827271: Replace views::Event with ui::Event. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « ash/system/tray/tray_background_view.cc ('k') | ash/system/tray/tray_item_more.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 (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_SYSTEM_TRAY_TRAY_ITEM_MORE_H_ 5 #ifndef ASH_SYSTEM_TRAY_TRAY_ITEM_MORE_H_
6 #define ASH_SYSTEM_TRAY_TRAY_ITEM_MORE_H_ 6 #define ASH_SYSTEM_TRAY_TRAY_ITEM_MORE_H_
7 7
8 #include "ash/system/tray/tray_views.h" 8 #include "ash/system/tray/tray_views.h"
9 #include "ui/views/view.h" 9 #include "ui/views/view.h"
10 10
(...skipping 21 matching lines...) Expand all
32 void SetAccessibleName(const string16& name); 32 void SetAccessibleName(const string16& name);
33 33
34 protected: 34 protected:
35 // Replaces the default icon (on the left of the label), and allows a custom 35 // Replaces the default icon (on the left of the label), and allows a custom
36 // view to be palced there. Once the default icon is replaced, |SetImage| 36 // view to be palced there. Once the default icon is replaced, |SetImage|
37 // should never be called. 37 // should never be called.
38 void ReplaceIcon(views::View* view); 38 void ReplaceIcon(views::View* view);
39 39
40 private: 40 private:
41 // Overridden from ActionableView. 41 // Overridden from ActionableView.
42 virtual bool PerformAction(const views::Event& event) OVERRIDE; 42 virtual bool PerformAction(const ui::Event& event) OVERRIDE;
43 43
44 // Overridden from views::View. 44 // Overridden from views::View.
45 virtual void Layout() OVERRIDE; 45 virtual void Layout() OVERRIDE;
46 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; 46 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
47 47
48 SystemTrayItem* owner_; 48 SystemTrayItem* owner_;
49 views::ImageView* icon_; 49 views::ImageView* icon_;
50 views::Label* label_; 50 views::Label* label_;
51 views::ImageView* more_; 51 views::ImageView* more_;
52 string16 accessible_name_; 52 string16 accessible_name_;
53 53
54 DISALLOW_COPY_AND_ASSIGN(TrayItemMore); 54 DISALLOW_COPY_AND_ASSIGN(TrayItemMore);
55 }; 55 };
56 56
57 } // namespace internal 57 } // namespace internal
58 } // namespace ash 58 } // namespace ash
59 59
60 #endif // ASH_SYSTEM_TRAY_TRAY_ITEM_MORE_H_ 60 #endif // ASH_SYSTEM_TRAY_TRAY_ITEM_MORE_H_
OLDNEW
« no previous file with comments | « ash/system/tray/tray_background_view.cc ('k') | ash/system/tray/tray_item_more.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698