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

Side by Side Diff: ash/wm/shelf_layout_manager.cc

Issue 10824247: Remove GestureEvent interface, and rename GestureEventImpl to GestureEvent. (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/wm/panel_window_event_filter.cc ('k') | ash/wm/system_gesture_event_filter.h » ('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 #include "ash/wm/shelf_layout_manager.h" 5 #include "ash/wm/shelf_layout_manager.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "ash/launcher/launcher.h" 9 #include "ash/launcher/launcher.h"
10 #include "ash/screen_ash.h" 10 #include "ash/screen_ash.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 // Overridden from aura::EventFilter: 60 // Overridden from aura::EventFilter:
61 virtual bool PreHandleKeyEvent(aura::Window* target, 61 virtual bool PreHandleKeyEvent(aura::Window* target,
62 ui::KeyEvent* event) OVERRIDE; 62 ui::KeyEvent* event) OVERRIDE;
63 virtual bool PreHandleMouseEvent(aura::Window* target, 63 virtual bool PreHandleMouseEvent(aura::Window* target,
64 ui::MouseEvent* event) OVERRIDE; 64 ui::MouseEvent* event) OVERRIDE;
65 virtual ui::TouchStatus PreHandleTouchEvent( 65 virtual ui::TouchStatus PreHandleTouchEvent(
66 aura::Window* target, 66 aura::Window* target,
67 ui::TouchEvent* event) OVERRIDE; 67 ui::TouchEvent* event) OVERRIDE;
68 virtual ui::GestureStatus PreHandleGestureEvent( 68 virtual ui::GestureStatus PreHandleGestureEvent(
69 aura::Window* target, 69 aura::Window* target,
70 ui::GestureEventImpl* event) OVERRIDE; 70 ui::GestureEvent* event) OVERRIDE;
71 71
72 private: 72 private:
73 ShelfLayoutManager* shelf_; 73 ShelfLayoutManager* shelf_;
74 bool in_mouse_drag_; 74 bool in_mouse_drag_;
75 75
76 DISALLOW_COPY_AND_ASSIGN(AutoHideEventFilter); 76 DISALLOW_COPY_AND_ASSIGN(AutoHideEventFilter);
77 }; 77 };
78 78
79 ShelfLayoutManager::AutoHideEventFilter::AutoHideEventFilter( 79 ShelfLayoutManager::AutoHideEventFilter::AutoHideEventFilter(
80 ShelfLayoutManager* shelf) 80 ShelfLayoutManager* shelf)
(...skipping 28 matching lines...) Expand all
109 109
110 ui::TouchStatus ShelfLayoutManager::AutoHideEventFilter::PreHandleTouchEvent( 110 ui::TouchStatus ShelfLayoutManager::AutoHideEventFilter::PreHandleTouchEvent(
111 aura::Window* target, 111 aura::Window* target,
112 ui::TouchEvent* event) { 112 ui::TouchEvent* event) {
113 return ui::TOUCH_STATUS_UNKNOWN; // Not handled. 113 return ui::TOUCH_STATUS_UNKNOWN; // Not handled.
114 } 114 }
115 115
116 ui::GestureStatus 116 ui::GestureStatus
117 ShelfLayoutManager::AutoHideEventFilter::PreHandleGestureEvent( 117 ShelfLayoutManager::AutoHideEventFilter::PreHandleGestureEvent(
118 aura::Window* target, 118 aura::Window* target,
119 ui::GestureEventImpl* event) { 119 ui::GestureEvent* event) {
120 return ui::GESTURE_STATUS_UNKNOWN; // Not handled. 120 return ui::GESTURE_STATUS_UNKNOWN; // Not handled.
121 } 121 }
122 122
123 //////////////////////////////////////////////////////////////////////////////// 123 ////////////////////////////////////////////////////////////////////////////////
124 // ShelfLayoutManager, public: 124 // ShelfLayoutManager, public:
125 125
126 ShelfLayoutManager::ShelfLayoutManager(views::Widget* status) 126 ShelfLayoutManager::ShelfLayoutManager(views::Widget* status)
127 : root_window_(Shell::GetPrimaryRootWindow()), 127 : root_window_(Shell::GetPrimaryRootWindow()),
128 in_layout_(false), 128 in_layout_(false),
129 auto_hide_behavior_(SHELF_AUTO_HIDE_BEHAVIOR_DEFAULT), 129 auto_hide_behavior_(SHELF_AUTO_HIDE_BEHAVIOR_DEFAULT),
(...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after
603 int ShelfLayoutManager::GetWorkAreaSize(const State& state, int size) const { 603 int ShelfLayoutManager::GetWorkAreaSize(const State& state, int size) const {
604 if (state.visibility_state == VISIBLE) 604 if (state.visibility_state == VISIBLE)
605 return size; 605 return size;
606 if (state.visibility_state == AUTO_HIDE) 606 if (state.visibility_state == AUTO_HIDE)
607 return kAutoHideSize; 607 return kAutoHideSize;
608 return 0; 608 return 0;
609 } 609 }
610 610
611 } // namespace internal 611 } // namespace internal
612 } // namespace ash 612 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/panel_window_event_filter.cc ('k') | ash/wm/system_gesture_event_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698