Cancel drag if display configuration changes.

ash/accelerators/accelerator_controller.cc

 // Copyright (c) 2012 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.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 
@@ skipping 35 matching lines @@
 #include "ui/compositor/debug_utils.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animation_sequence.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/oak/oak.h"
 #include "ui/views/debug_utils.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/display/output_configurator_animation.h"
+#include "base/chromeos/chromeos_version.h"
 #include "chromeos/display/output_configurator.h"
 #endif  // defined(OS_CHROMEOS)
 
 namespace ash {
 namespace {
 
 // Factor of magnification scale. For example, when this value is 1.189, scale
 // value will be changed x1.000, x1.189, x1.414, x1.681, x2.000, ...
 // Note: this value is 2.0 ^ (1 / 4).
 const float kMagnificationFactor = 1.18920712f;
@@ skipping 32 matching lines @@
 
 bool HandleCrosh() {
   Shell::GetInstance()->delegate()->OpenCrosh();
   return true;
 }
 
 bool HandleToggleSpokenFeedback() {
   Shell::GetInstance()->delegate()->ToggleSpokenFeedback();
   return true;
 }
-#endif
+void HandleCycleDisplayMode() {
+  Shell* shell = Shell::GetInstance();
+  if (!base::chromeos::IsRunningOnChromeOS()) {
+    internal::MultiDisplayManager::CycleDisplay();
+  } else if (shell->output_configurator()->connected_output_count() > 1) {
+    internal::OutputConfiguratorAnimation* animation =
+        shell->output_configurator_animation();
+    animation->StartFadeOutAnimation(base::Bind(
+        base::IgnoreResult(&chromeos::OutputConfigurator::CycleDisplayMode),
+        base::Unretained(shell->output_configurator())));
+  }
+}
+
+#endif  // defined(OS_CHROMEOS)
 
 bool HandleExit() {
   ShellDelegate* delegate = Shell::GetInstance()->delegate();
   if (!delegate)
     return false;
   delegate->Exit();
   return true;
 }
 
 bool HandleNewTab() {
@@ skipping 314 matching lines @@
     case OPEN_FILE_MANAGER_TAB:
       return HandleFileManager(false /* as_dialog */);
     case OPEN_CROSH:
       return HandleCrosh();
     case TOGGLE_SPOKEN_FEEDBACK:
       return HandleToggleSpokenFeedback();
     case TOGGLE_WIFI:
       if (Shell::GetInstance()->tray_delegate())
         Shell::GetInstance()->tray_delegate()->ToggleWifi();
       return true;
-    case CYCLE_DISPLAY_MODE: {
-      Shell* shell = Shell::GetInstance();
-      if (shell->output_configurator()->connected_output_count() > 1) {
-        internal::OutputConfiguratorAnimation* animation =
-            shell->output_configurator_animation();
-        animation->StartFadeOutAnimation(base::Bind(
-            base::IgnoreResult(&chromeos::OutputConfigurator::CycleDisplayMode),
-            base::Unretained(shell->output_configurator())));
-        return true;
-      }
-      return false;
-    }
+    case CYCLE_DISPLAY_MODE:
+      HandleCycleDisplayMode();
+      return true;
 #endif
     case OPEN_FEEDBACK_PAGE:
       ash::Shell::GetInstance()->delegate()->OpenFeedbackPage();
       return true;
     case EXIT:
       return HandleExit();
     case NEW_INCOGNITO_WINDOW:
       return HandleNewWindow(true /* is_incognito */);
     case NEW_TAB:
       if (key_code == ui::VKEY_T && shell->delegate())
@@ skipping 202 matching lines @@
       break;
     }
     case ROTATE_WINDOWS:
       return HandleRotateWindows();
     case ROTATE_SCREEN:
       return HandleRotateScreen();
     case TOGGLE_DESKTOP_BACKGROUND_MODE:
       return HandleToggleDesktopBackgroundMode();
     case TOGGLE_ROOT_WINDOW_FULL_SCREEN:
       return HandleToggleRootWindowFullScreen();
-    case DISPLAY_ADD_REMOVE:
-      internal::MultiDisplayManager::AddRemoveDisplay();
-      return true;
-    case DISPLAY_CYCLE:
-      internal::MultiDisplayManager::CycleDisplay();
-      return true;
     case DISPLAY_TOGGLE_SCALE:
       internal::MultiDisplayManager::ToggleDisplayScale();
       return true;
     case MAGNIFY_SCREEN_ZOOM_IN:
       return HandleMagnifyScreen(1);
     case MAGNIFY_SCREEN_ZOOM_OUT:
       return HandleMagnifyScreen(-1);
     case MEDIA_NEXT_TRACK:
       return HandleMediaNextTrack();
     case MEDIA_PLAY_PAUSE:
@@ skipping 94 matching lines @@
     accelerators_.insert(
         std::make_pair(accelerator, accelerators[i].action));
   }
 }
 
 bool AcceleratorController::CanHandleAccelerators() const {
   return true;
 }
 
 }  // namespace ash