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

Side by Side Diff: ash/system/status_area_widget_delegate.h

Issue 11280290: events: Change gesture-event handler in EventHandler to not return any values. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years 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/launcher/launcher_view.cc ('k') | ash/system/status_area_widget_delegate.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_STATUS_AREA_WIDGET_DELEGATE_H_ 5 #ifndef ASH_SYSTEM_STATUS_AREA_WIDGET_DELEGATE_H_
6 #define ASH_SYSTEM_STATUS_AREA_WIDGET_DELEGATE_H_ 6 #define ASH_SYSTEM_STATUS_AREA_WIDGET_DELEGATE_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/wm/gestures/shelf_gesture_handler.h" 9 #include "ash/wm/gestures/shelf_gesture_handler.h"
10 #include "ash/wm/shelf_types.h" 10 #include "ash/wm/shelf_types.h"
(...skipping 25 matching lines...) Expand all
36 36
37 // Overridden from views::AccessiblePaneView. 37 // Overridden from views::AccessiblePaneView.
38 virtual View* GetDefaultFocusableChild() OVERRIDE; 38 virtual View* GetDefaultFocusableChild() OVERRIDE;
39 39
40 // Overridden from views::View: 40 // Overridden from views::View:
41 virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE; 41 virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
42 virtual views::Widget* GetWidget() OVERRIDE; 42 virtual views::Widget* GetWidget() OVERRIDE;
43 virtual const views::Widget* GetWidget() const OVERRIDE; 43 virtual const views::Widget* GetWidget() const OVERRIDE;
44 44
45 // Overridden from ui::EventHandler: 45 // Overridden from ui::EventHandler:
46 virtual ui::EventResult OnGestureEvent(ui::GestureEvent* event) OVERRIDE; 46 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
47 47
48 // views::WidgetDelegate overrides: 48 // views::WidgetDelegate overrides:
49 virtual bool CanActivate() const OVERRIDE; 49 virtual bool CanActivate() const OVERRIDE;
50 virtual void DeleteDelegate() OVERRIDE; 50 virtual void DeleteDelegate() OVERRIDE;
51 51
52 protected: 52 protected:
53 // Overridden from views::View: 53 // Overridden from views::View:
54 virtual void ChildPreferredSizeChanged(View* child) OVERRIDE; 54 virtual void ChildPreferredSizeChanged(View* child) OVERRIDE;
55 55
56 private: 56 private:
57 void UpdateWidgetSize(); 57 void UpdateWidgetSize();
58 58
59 const FocusCycler* focus_cycler_for_testing_; 59 const FocusCycler* focus_cycler_for_testing_;
60 ShelfAlignment alignment_; 60 ShelfAlignment alignment_;
61 61
62 ShelfGestureHandler gesture_handler_; 62 ShelfGestureHandler gesture_handler_;
63 63
64 DISALLOW_COPY_AND_ASSIGN(StatusAreaWidgetDelegate); 64 DISALLOW_COPY_AND_ASSIGN(StatusAreaWidgetDelegate);
65 }; 65 };
66 66
67 } // namespace internal 67 } // namespace internal
68 } // namespace ash 68 } // namespace ash
69 69
70 #endif // ASH_SYSTEM_STATUS_AREA_WIDGET_DELEGATE_H_ 70 #endif // ASH_SYSTEM_STATUS_AREA_WIDGET_DELEGATE_H_
OLDNEW
« no previous file with comments | « ash/launcher/launcher_view.cc ('k') | ash/system/status_area_widget_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698