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

Unified Diff: ash/accelerators/accelerator_controller_delegate_aura.cc

Issue 2269383002: Magnifier border is now more visible on light backgrounds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Created 4 years, 4 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 side-by-side diff with in-line comments
Download patch
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);
}
}
« no previous file with comments | « ash/BUILD.gn ('k') | ash/ash.gyp » ('j') | ash/magnifier/partial_magnification_controller.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698