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

Side by Side Diff: ash/app_list/app_list.cc

Issue 9221014: aura: Gesture event plumbing (skeleton). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: copyright Created 8 years, 11 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/app_list/app_list.h ('k') | ash/drag_drop/drag_drop_controller.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/app_list/app_list.h" 5 #include "ash/app_list/app_list.h"
6 6
7 #include "ash/app_list/app_list_model.h" 7 #include "ash/app_list/app_list_model.h"
8 #include "ash/app_list/app_list_view.h" 8 #include "ash/app_list/app_list_view.h"
9 #include "ash/ash_switches.h" 9 #include "ash/ash_switches.h"
10 #include "ash/shell_delegate.h" 10 #include "ash/shell_delegate.h"
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 SetVisible(false); 142 SetVisible(false);
143 } 143 }
144 return false; 144 return false;
145 } 145 }
146 146
147 ui::TouchStatus AppList::PreHandleTouchEvent(aura::Window* target, 147 ui::TouchStatus AppList::PreHandleTouchEvent(aura::Window* target,
148 aura::TouchEvent* event) { 148 aura::TouchEvent* event) {
149 return ui::TOUCH_STATUS_UNKNOWN; 149 return ui::TOUCH_STATUS_UNKNOWN;
150 } 150 }
151 151
152 ui::GestureStatus AppList::PreHandleGestureEvent(
153 aura::Window* target,
154 aura::GestureEvent* event) {
155 return ui::GESTURE_STATUS_UNKNOWN;
156 }
157
152 //////////////////////////////////////////////////////////////////////////////// 158 ////////////////////////////////////////////////////////////////////////////////
153 // AppList, ui::LayerAnimationObserver implementation: 159 // AppList, ui::LayerAnimationObserver implementation:
154 160
155 void AppList::OnLayerAnimationEnded( 161 void AppList::OnLayerAnimationEnded(
156 const ui::LayerAnimationSequence* sequence) { 162 const ui::LayerAnimationSequence* sequence) {
157 if (!is_visible_ ) 163 if (!is_visible_ )
158 widget_->Close(); 164 widget_->Close();
159 } 165 }
160 166
161 void AppList::OnLayerAnimationAborted( 167 void AppList::OnLayerAnimationAborted(
(...skipping 15 matching lines...) Expand all
177 } 183 }
178 184
179 void AppList::OnWidgetActivationChanged(views::Widget* widget, bool active) { 185 void AppList::OnWidgetActivationChanged(views::Widget* widget, bool active) {
180 DCHECK(widget_ == widget); 186 DCHECK(widget_ == widget);
181 if (widget_ && is_visible_ && !active) 187 if (widget_ && is_visible_ && !active)
182 SetVisible(false); 188 SetVisible(false);
183 } 189 }
184 190
185 } // namespace internal 191 } // namespace internal
186 } // namespace ash 192 } // namespace ash
OLDNEW
« no previous file with comments | « ash/app_list/app_list.h ('k') | ash/drag_drop/drag_drop_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698