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

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

Issue 10825254: Remove views::KeyEvent, replacing uses of it with ui::KeyEvent. (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 | « no previous file | ash/system/tray/tray_views.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_VIEWS_H_ 5 #ifndef ASH_SYSTEM_TRAY_TRAY_VIEWS_H_
6 #define ASH_SYSTEM_TRAY_TRAY_VIEWS_H_ 6 #define ASH_SYSTEM_TRAY_TRAY_VIEWS_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/wm/shelf_types.h" 9 #include "ash/wm/shelf_types.h"
10 #include "ui/gfx/font.h" 10 #include "ui/gfx/font.h"
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 67
68 protected: 68 protected:
69 void DrawBorder(gfx::Canvas* canvas, const gfx::Rect& bounds); 69 void DrawBorder(gfx::Canvas* canvas, const gfx::Rect& bounds);
70 70
71 // Performs an action when user clicks on the view (on mouse-press event), or 71 // Performs an action when user clicks on the view (on mouse-press event), or
72 // presses a key when this view is in focus. Returns true if the event has 72 // presses a key when this view is in focus. Returns true if the event has
73 // been handled and an action was performed. Returns false otherwise. 73 // been handled and an action was performed. Returns false otherwise.
74 virtual bool PerformAction(const views::Event& event) = 0; 74 virtual bool PerformAction(const views::Event& event) = 0;
75 75
76 // Overridden from views::View. 76 // Overridden from views::View.
77 virtual bool OnKeyPressed(const views::KeyEvent& event) OVERRIDE; 77 virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE;
78 virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE; 78 virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE;
79 virtual void OnMouseReleased(const views::MouseEvent& event) OVERRIDE; 79 virtual void OnMouseReleased(const views::MouseEvent& event) OVERRIDE;
80 virtual void OnMouseCaptureLost() OVERRIDE; 80 virtual void OnMouseCaptureLost() OVERRIDE;
81 virtual ui::GestureStatus OnGestureEvent( 81 virtual ui::GestureStatus OnGestureEvent(
82 const views::GestureEvent& event) OVERRIDE; 82 const views::GestureEvent& event) OVERRIDE;
83 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; 83 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
84 virtual void OnPaintFocusBorder(gfx::Canvas* canvas) OVERRIDE; 84 virtual void OnPaintFocusBorder(gfx::Canvas* canvas) OVERRIDE;
85 85
86 private: 86 private:
87 string16 accessible_name_; 87 string16 accessible_name_;
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 void SetTrayImageItemBorder(views::View* tray_view, ShelfAlignment alignment); 295 void SetTrayImageItemBorder(views::View* tray_view, ShelfAlignment alignment);
296 // Sets the empty border around a label tray item for adjusting the space 296 // Sets the empty border around a label tray item for adjusting the space
297 // around it. 297 // around it.
298 void SetTrayLabelItemBorder(TrayItemView* tray_view, 298 void SetTrayLabelItemBorder(TrayItemView* tray_view,
299 ShelfAlignment alignment); 299 ShelfAlignment alignment);
300 300
301 } // namespace internal 301 } // namespace internal
302 } // namespace ash 302 } // namespace ash
303 303
304 #endif // ASH_SYSTEM_TRAY_TRAY_VIEWS_H_ 304 #endif // ASH_SYSTEM_TRAY_TRAY_VIEWS_H_
OLDNEW
« no previous file with comments | « no previous file | ash/system/tray/tray_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698