Cancel drag if display configuration changes.

* Removed debug specific shortcut to emulate display change.
* fixed ui_controls to use the correct position
* a few minor clean ups (removing unnecessary namesapce,
  rename Monitor -> Display)

BUG=14457
TEST=covered by test

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=155762

Review URL: https://chromiumcodereview.appspot.com/10909043

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155975 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 18 insertions, 25 deletions

diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
index 511087d..533f1e6 100644
--- a/ash/accelerators/accelerator_controller.cc
+++ b/ash/accelerators/accelerator_controller.cc
@@ -53,6 +53,7 @@
 
 #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)
 
@@ -105,7 +106,20 @@ 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();
@@ -440,18 +454,9 @@ bool AcceleratorController::PerformAction(int action,
       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();
@@ -674,12 +679,6 @@ bool AcceleratorController::PerformAction(int action,
       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;
diff --git a/ash/accelerators/accelerator_table.cc b/ash/accelerators/accelerator_table.cc
index 7b4d036..e7bfcc0 100644
--- a/ash/accelerators/accelerator_table.cc
+++ b/ash/accelerators/accelerator_table.cc
@@ -147,8 +147,6 @@ const AcceleratorData kDebugAcceleratorData[] = {
   // For testing on systems where Alt-Tab is already mapped.
   { true, ui::VKEY_W, ui::EF_ALT_DOWN, CYCLE_FORWARD_MRU },
   { true, ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, CYCLE_BACKWARD_MRU },
-  { true, ui::VKEY_F4, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, DISPLAY_CYCLE },
-  { true, ui::VKEY_F4, ui::EF_SHIFT_DOWN, DISPLAY_ADD_REMOVE },
   { true, ui::VKEY_HOME, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
     DISPLAY_TOGGLE_SCALE },
 #if !defined(NDEBUG)
@@ -173,8 +171,6 @@ const AcceleratorAction kReservedActions[] = {
   FOCUS_PREVIOUS_PANE,  // Control+F1
   FOCUS_NEXT_PANE,  // Control+F2
   CYCLE_DISPLAY_MODE,  // Control+F4
-  DISPLAY_ADD_REMOVE,  // Shift+F4
-  DISPLAY_CYCLE,  // Shift+Control+F4
   CYCLE_FORWARD_LINEAR,  // F5
   CYCLE_BACKWARD_LINEAR,  // Shift+F5
   TAKE_SCREENSHOT,  // Control+F5
diff --git a/ash/accelerators/accelerator_table.h b/ash/accelerators/accelerator_table.h
index 3469244..4f2b867 100644
--- a/ash/accelerators/accelerator_table.h
+++ b/ash/accelerators/accelerator_table.h
@@ -20,8 +20,6 @@ enum AcceleratorAction {
   CYCLE_FORWARD_LINEAR,
   CYCLE_FORWARD_MRU,
   DISABLE_CAPS_LOCK,
-  DISPLAY_ADD_REMOVE,
-  DISPLAY_CYCLE,
   DISPLAY_TOGGLE_SCALE,
   EXIT,
   FOCUS_LAUNCHER,