Magnifier border is now more visible on light backgrounds.

ash/accelerators/accelerator_controller_delegate_aura.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/accelerators/accelerator_controller_delegate_aura.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <utility>
@@ skipping 15 matching lines @@
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm/wm_event.h"
 #include "ash/common/wm_shell.h"
 #include "ash/debug.h"
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/desktop_background/user_wallpaper_delegate.h"
 #include "ash/display/display_manager.h"
 #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"
 #include "ash/screen_util.h"
 #include "ash/screenshot_delegate.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/touch/touch_hud_debug.h"
 #include "ash/utility/screenshot_controller.h"
@@ skipping 98 matching lines @@
   base::RecordAction(UserMetricsAction("Accel_Launch_App"));
   Shelf::ForPrimaryDisplay()->LaunchAppIndexAt(n);
 }
 
 void HandleLaunchLastApp() {
   base::RecordAction(UserMetricsAction("Accel_Launch_Last_App"));
   Shelf::ForPrimaryDisplay()->LaunchAppIndexAt(-1);
 }
 
 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
 void HandleMagnifyScreen(int delta_index) {
   if (Shell::GetInstance()->magnification_controller()->IsEnabled()) {
     // TODO(yoshiki): Move the following logic to MagnificationController.
     float scale = Shell::GetInstance()->magnification_controller()->GetScale();
     // Calculate rounded logarithm (base kMagnificationScaleFactor) of scale.
     int scale_index =
         std::floor(std::log(scale) / std::log(kMagnificationScaleFactor) + 0.5);
 
     int new_scale_index = std::max(0, std::min(8, scale_index + 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);
   }
 }
 
 display::Display::Rotation GetNextRotation(display::Display::Rotation current) {
   switch (current) {
     case display::Display::ROTATE_0:
       return display::Display::ROTATE_90;
     case display::Display::ROTATE_90:
       return display::Display::ROTATE_180;
     case display::Display::ROTATE_180:
@@ skipping 465 matching lines @@
           message_center::NotifierId(
               message_center::NotifierId::SYSTEM_COMPONENT,
               system_notifier::kNotifierDeprecatedAccelerator),
           message_center::RichNotificationData(),
           new DeprecatedAcceleratorNotificationDelegate));
   message_center::MessageCenter::Get()->AddNotification(
       std::move(notification));
 }
 
 }  // namespace ash