OLD | NEW |
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/magnifier/magnification_controller.h" | 5 #include "ash/magnifier/magnification_controller.h" |
6 | 6 |
| 7 #include <utility> |
| 8 |
7 #include "ash/accelerators/accelerator_controller.h" | 9 #include "ash/accelerators/accelerator_controller.h" |
8 #include "ash/accessibility_delegate.h" | 10 #include "ash/accessibility_delegate.h" |
9 #include "ash/ash_switches.h" | 11 #include "ash/ash_switches.h" |
10 #include "ash/display/root_window_transformers.h" | 12 #include "ash/display/root_window_transformers.h" |
11 #include "ash/host/ash_window_tree_host.h" | 13 #include "ash/host/ash_window_tree_host.h" |
12 #include "ash/host/root_window_transformer.h" | 14 #include "ash/host/root_window_transformer.h" |
13 #include "ash/root_window_controller.h" | 15 #include "ash/root_window_controller.h" |
14 #include "ash/screen_util.h" | 16 #include "ash/screen_util.h" |
15 #include "ash/shell.h" | 17 #include "ash/shell.h" |
16 #include "ash/system/tray/system_tray_delegate.h" | 18 #include "ash/system/tray/system_tray_delegate.h" |
(...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
366 settings.SetPreemptionStrategy( | 368 settings.SetPreemptionStrategy( |
367 ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET); | 369 ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET); |
368 settings.SetTweenType(tween_type); | 370 settings.SetTweenType(tween_type); |
369 settings.SetTransitionDuration( | 371 settings.SetTransitionDuration( |
370 base::TimeDelta::FromMilliseconds(duration_in_ms)); | 372 base::TimeDelta::FromMilliseconds(duration_in_ms)); |
371 | 373 |
372 gfx::Display display = | 374 gfx::Display display = |
373 Shell::GetScreen()->GetDisplayNearestWindow(root_window_); | 375 Shell::GetScreen()->GetDisplayNearestWindow(root_window_); |
374 scoped_ptr<RootWindowTransformer> transformer( | 376 scoped_ptr<RootWindowTransformer> transformer( |
375 CreateRootWindowTransformerForDisplay(root_window_, display)); | 377 CreateRootWindowTransformerForDisplay(root_window_, display)); |
376 GetRootWindowController(root_window_)->ash_host()->SetRootWindowTransformer( | 378 GetRootWindowController(root_window_) |
377 transformer.Pass()); | 379 ->ash_host() |
| 380 ->SetRootWindowTransformer(std::move(transformer)); |
378 | 381 |
379 if (duration_in_ms > 0) | 382 if (duration_in_ms > 0) |
380 is_on_animation_ = true; | 383 is_on_animation_ = true; |
381 | 384 |
382 return true; | 385 return true; |
383 } | 386 } |
384 | 387 |
385 void MagnificationControllerImpl::StartOrStopScrollIfNecessary() { | 388 void MagnificationControllerImpl::StartOrStopScrollIfNecessary() { |
386 // This value controls the scrolling speed. | 389 // This value controls the scrolling speed. |
387 const int kMoveOffset = 40; | 390 const int kMoveOffset = 40; |
(...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
846 | 849 |
847 //////////////////////////////////////////////////////////////////////////////// | 850 //////////////////////////////////////////////////////////////////////////////// |
848 // MagnificationController: | 851 // MagnificationController: |
849 | 852 |
850 // static | 853 // static |
851 MagnificationController* MagnificationController::CreateInstance() { | 854 MagnificationController* MagnificationController::CreateInstance() { |
852 return new MagnificationControllerImpl(); | 855 return new MagnificationControllerImpl(); |
853 } | 856 } |
854 | 857 |
855 } // namespace ash | 858 } // namespace ash |
OLD | NEW |