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

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

Issue 11592011: events: Update mouse-event handlers to not return EventResult. (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 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 void ImmersiveModeController::MaybeStackViewAtTop() { 289 void ImmersiveModeController::MaybeStackViewAtTop() {
290 #if defined(USE_AURA) 290 #if defined(USE_AURA)
291 if (enabled_ && revealed_ && reveal_view_.get()) { 291 if (enabled_ && revealed_ && reveal_view_.get()) {
292 ui::Layer* reveal_layer = reveal_view_->layer(); 292 ui::Layer* reveal_layer = reveal_view_->layer();
293 reveal_layer->parent()->StackAtTop(reveal_layer); 293 reveal_layer->parent()->StackAtTop(reveal_layer);
294 } 294 }
295 #endif 295 #endif
296 } 296 }
297 297
298 // ui::EventHandler overrides: 298 // ui::EventHandler overrides:
299 ui::EventResult ImmersiveModeController::OnMouseEvent(ui::MouseEvent* event) { 299 void ImmersiveModeController::OnMouseEvent(ui::MouseEvent* event) {
300 if (event->type() != ui::ET_MOUSE_MOVED) 300 if (event->type() != ui::ET_MOUSE_MOVED)
301 return ui::ER_UNHANDLED; 301 return;
302 if (event->location().y() == 0) { 302 if (event->location().y() == 0) {
303 // Use a timer to detect if the cursor stays at the top past a delay. 303 // Use a timer to detect if the cursor stays at the top past a delay.
304 if (!top_timer_.IsRunning()) { 304 if (!top_timer_.IsRunning()) {
305 top_timer_.Start(FROM_HERE, 305 top_timer_.Start(FROM_HERE,
306 base::TimeDelta::FromMilliseconds(kRevealDelayMs), 306 base::TimeDelta::FromMilliseconds(kRevealDelayMs),
307 this, &ImmersiveModeController::StartReveal); 307 this, &ImmersiveModeController::StartReveal);
308 } 308 }
309 } else { 309 } else {
310 // Cursor left the top edge. 310 // Cursor left the top edge.
311 top_timer_.Stop(); 311 top_timer_.Stop();
312 } 312 }
313 // Pass along event for further handling. 313 // Pass along event for further handling.
314 return ui::ER_UNHANDLED;
315 } 314 }
316 315
317 // ui::ImplicitAnimationObserver overrides: 316 // ui::ImplicitAnimationObserver overrides:
318 void ImmersiveModeController::OnImplicitAnimationsCompleted() { 317 void ImmersiveModeController::OnImplicitAnimationsCompleted() {
319 // Fired when the slide-out animation completes. 318 // Fired when the slide-out animation completes.
320 reveal_view_.reset(); // Also removes from parent. 319 reveal_view_.reset(); // Also removes from parent.
321 } 320 }
322 321
323 // Testing interface: 322 // Testing interface:
324 void ImmersiveModeController::StartRevealForTest() { 323 void ImmersiveModeController::StartRevealForTest() {
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
423 422
424 void ImmersiveModeController::AnimateHideRevealView() { 423 void ImmersiveModeController::AnimateHideRevealView() {
425 ui::Layer* layer = reveal_view_->layer(); 424 ui::Layer* layer = reveal_view_->layer();
426 ui::ScopedLayerAnimationSettings settings(layer->GetAnimator()); 425 ui::ScopedLayerAnimationSettings settings(layer->GetAnimator());
427 settings.SetTweenType(ui::Tween::EASE_OUT); 426 settings.SetTweenType(ui::Tween::EASE_OUT);
428 settings.AddObserver(this); // Resets |reveal_view_| on completion. 427 settings.AddObserver(this); // Resets |reveal_view_| on completion.
429 gfx::Transform transform; 428 gfx::Transform transform;
430 transform.Translate(0, -layer->bounds().height()); 429 transform.Translate(0, -layer->bounds().height());
431 layer->SetTransform(transform); 430 layer->SetTransform(transform);
432 } 431 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/immersive_mode_controller.h ('k') | content/browser/renderer_host/render_widget_host_view_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698