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

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

Issue 10912063: events: Get rid of GestureStatus in favour of EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 3 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/magnifier/magnification_controller.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 23 matching lines...) Expand all
34 34
35 void set_alignment(ShelfAlignment alignment) { alignment_ = alignment; } 35 void set_alignment(ShelfAlignment alignment) { alignment_ = alignment; }
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 virtual ui::GestureStatus OnGestureEvent( 44 virtual ui::EventResult OnGestureEvent(
45 const ui::GestureEvent& event) OVERRIDE; 45 const ui::GestureEvent& event) OVERRIDE;
46 46
47 // views::WidgetDelegate overrides: 47 // views::WidgetDelegate overrides:
48 virtual bool CanActivate() const OVERRIDE; 48 virtual bool CanActivate() const OVERRIDE;
49 virtual void DeleteDelegate() OVERRIDE; 49 virtual void DeleteDelegate() OVERRIDE;
50 50
51 protected: 51 protected:
52 // Overridden from views::View: 52 // Overridden from views::View:
53 virtual void ChildPreferredSizeChanged(View* child) OVERRIDE; 53 virtual void ChildPreferredSizeChanged(View* child) OVERRIDE;
54 54
55 private: 55 private:
56 void UpdateWidgetSize(); 56 void UpdateWidgetSize();
57 57
58 const FocusCycler* focus_cycler_for_testing_; 58 const FocusCycler* focus_cycler_for_testing_;
59 ShelfAlignment alignment_; 59 ShelfAlignment alignment_;
60 60
61 ShelfGestureHandler gesture_handler_; 61 ShelfGestureHandler gesture_handler_;
62 62
63 DISALLOW_COPY_AND_ASSIGN(StatusAreaWidgetDelegate); 63 DISALLOW_COPY_AND_ASSIGN(StatusAreaWidgetDelegate);
64 }; 64 };
65 65
66 } // namespace internal 66 } // namespace internal
67 } // namespace ash 67 } // namespace ash
68 68
69 #endif // ASH_SYSTEM_STATUS_AREA_WIDGET_DELEGATE_H_ 69 #endif // ASH_SYSTEM_STATUS_AREA_WIDGET_DELEGATE_H_
OLDNEW
« no previous file with comments | « ash/magnifier/magnification_controller.cc ('k') | ash/system/status_area_widget_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698