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

Side by Side Diff: chrome/browser/ui/views/immersive_mode_controller.cc

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
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 "chrome/browser/ui/views/immersive_mode_controller.h" 5 #include "chrome/browser/ui/views/immersive_mode_controller.h"
6 6
7 #include "chrome/browser/ui/views/frame/browser_frame.h" 7 #include "chrome/browser/ui/views/frame/browser_frame.h"
8 #include "chrome/browser/ui/views/frame/browser_view.h" 8 #include "chrome/browser/ui/views/frame/browser_view.h"
9 #include "chrome/browser/ui/views/frame/contents_container.h" 9 #include "chrome/browser/ui/views/frame/contents_container.h"
10 #include "chrome/browser/ui/views/tabs/tab_strip.h" 10 #include "chrome/browser/ui/views/tabs/tab_strip.h"
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 // to either a tab or the caption area, bypassing pre-target handlers and 157 // to either a tab or the caption area, bypassing pre-target handlers and
158 // intermediate views. 158 // intermediate views.
159 if (enabled_) 159 if (enabled_)
160 browser_view_->GetNativeWindow()->AddPreTargetHandler(this); 160 browser_view_->GetNativeWindow()->AddPreTargetHandler(this);
161 else 161 else
162 browser_view_->GetNativeWindow()->RemovePreTargetHandler(this); 162 browser_view_->GetNativeWindow()->RemovePreTargetHandler(this);
163 #endif // defined(USE_AURA) 163 #endif // defined(USE_AURA)
164 } 164 }
165 165
166 // ui::EventHandler overrides: 166 // ui::EventHandler overrides:
167 ui::EventResult ImmersiveModeController::OnKeyEvent(ui::KeyEvent* event) {
168 return ui::ER_UNHANDLED;
169 }
170
171 ui::EventResult ImmersiveModeController::OnMouseEvent(ui::MouseEvent* event) { 167 ui::EventResult ImmersiveModeController::OnMouseEvent(ui::MouseEvent* event) {
172 if (event->type() != ui::ET_MOUSE_MOVED) 168 if (event->type() != ui::ET_MOUSE_MOVED)
173 return ui::ER_UNHANDLED; 169 return ui::ER_UNHANDLED;
174 if (event->location().y() == 0) { 170 if (event->location().y() == 0) {
175 // Use a timer to detect if the cursor stays at the top past a delay. 171 // Use a timer to detect if the cursor stays at the top past a delay.
176 if (!top_timer_.IsRunning()) { 172 if (!top_timer_.IsRunning()) {
177 top_timer_.Start(FROM_HERE, 173 top_timer_.Start(FROM_HERE,
178 base::TimeDelta::FromMilliseconds(kRevealDelayMs), 174 base::TimeDelta::FromMilliseconds(kRevealDelayMs),
179 this, &ImmersiveModeController::StartReveal); 175 this, &ImmersiveModeController::StartReveal);
180 } 176 }
181 } else { 177 } else {
182 // Cursor left the top edge. 178 // Cursor left the top edge.
183 top_timer_.Stop(); 179 top_timer_.Stop();
184 } 180 }
185 // Pass along event for further handling. 181 // Pass along event for further handling.
186 return ui::ER_UNHANDLED; 182 return ui::ER_UNHANDLED;
187 } 183 }
188 184
189 ui::EventResult ImmersiveModeController::OnScrollEvent(ui::ScrollEvent* event) {
190 return ui::ER_UNHANDLED;
191 }
192
193 ui::EventResult ImmersiveModeController::OnTouchEvent(ui::TouchEvent* event) {
194 return ui::ER_UNHANDLED;
195 }
196
197 ui::EventResult ImmersiveModeController::OnGestureEvent(
198 ui::GestureEvent* event) {
199 return ui::ER_UNHANDLED;
200 }
201
202 // views::MouseWatcherListener overrides: 185 // views::MouseWatcherListener overrides:
203 void ImmersiveModeController::MouseMovedOutOfHost() { 186 void ImmersiveModeController::MouseMovedOutOfHost() {
204 EndReveal(true); 187 EndReveal(true);
205 } 188 }
206 189
207 // ui::ImplicitAnimationObserver overrides: 190 // ui::ImplicitAnimationObserver overrides:
208 void ImmersiveModeController::OnImplicitAnimationsCompleted() { 191 void ImmersiveModeController::OnImplicitAnimationsCompleted() {
209 // Fired when the slide-out animation completes. 192 // Fired when the slide-out animation completes.
210 ResetRevealView(); 193 ResetRevealView();
211 } 194 }
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
293 gfx::Transform transform; 276 gfx::Transform transform;
294 transform.Translate(0, -layer->bounds().height()); 277 transform.Translate(0, -layer->bounds().height());
295 layer->SetTransform(transform); 278 layer->SetTransform(transform);
296 } 279 }
297 280
298 void ImmersiveModeController::ResetRevealView() { 281 void ImmersiveModeController::ResetRevealView() {
299 browser_view_->RemoveChildView(reveal_view_.get()); 282 browser_view_->RemoveChildView(reveal_view_.get());
300 reveal_view_.reset(); 283 reveal_view_.reset();
301 } 284 }
302 285
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/immersive_mode_controller.h ('k') | chrome/browser/ui/views/location_bar/ev_bubble_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698