| Index: ash/accelerators/accelerator_controller_delegate_aura.cc
|
| diff --git a/ash/accelerators/accelerator_controller_delegate_aura.cc b/ash/accelerators/accelerator_controller_delegate_aura.cc
|
| index e90cdab38be3633b86c3d499f60819e2dabc5c06..df6f44bcbdeea69783d86e86c143158a1af5f62f 100644
|
| --- a/ash/accelerators/accelerator_controller_delegate_aura.cc
|
| +++ b/ash/accelerators/accelerator_controller_delegate_aura.cc
|
| @@ -33,7 +33,6 @@
|
| #include "ash/display/window_tree_host_manager.h"
|
| #include "ash/host/ash_window_tree_host.h"
|
| #include "ash/magnifier/magnification_controller.h"
|
| -#include "ash/magnifier/partial_magnification_controller.h"
|
| #include "ash/root_window_controller.h"
|
| #include "ash/rotator/screen_rotation_animator.h"
|
| #include "ash/rotator/window_rotation.h"
|
| @@ -152,9 +151,7 @@ void HandleLaunchLastApp() {
|
| }
|
|
|
| bool CanHandleMagnifyScreen() {
|
| - Shell* shell = Shell::GetInstance();
|
| - return shell->magnification_controller()->IsEnabled() ||
|
| - shell->partial_magnification_controller()->is_enabled();
|
| + return Shell::GetInstance()->magnification_controller()->IsEnabled();
|
| }
|
|
|
| // Magnify the screen
|
| @@ -170,11 +167,6 @@ void HandleMagnifyScreen(int delta_index) {
|
|
|
| Shell::GetInstance()->magnification_controller()->SetScale(
|
| std::pow(kMagnificationScaleFactor, new_scale_index), true);
|
| - } else if (Shell::GetInstance()
|
| - ->partial_magnification_controller()
|
| - ->is_enabled()) {
|
| - float scale = delta_index > 0 ? kDefaultPartialMagnifiedScale : 1;
|
| - Shell::GetInstance()->partial_magnification_controller()->SetScale(scale);
|
| }
|
| }
|
|
|
|
|