Revert 195733

>Add debug shortcuts that toggles options to shows paint rects, debug borders and fps counters.
>Cleanup: Separate desktop shortcuts which are useful only on linux desktop, and debug shortcuts.
>
>BUG=227375
>Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=195733

TBR=oshima@chromium.org
BUG=

Review URL: https://codereview.chromium.org/14311006

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

9 files changed, 58 insertions, 186 deletions

diff --git a/ash/DEPS b/ash/DEPS
index 29f9c96..7aa545b 100644
--- a/ash/DEPS
+++ b/ash/DEPS
@@ -1,5 +1,4 @@
 include_rules = [
-  "+cc/debug",
   "+chromeos",
   "+content/public",
   "+grit/ash_resources.h",
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
index 9bf6a35..6450c87 100644
--- a/ash/accelerators/accelerator_controller.cc
+++ b/ash/accelerators/accelerator_controller.cc
@@ -12,7 +12,6 @@
 #include "ash/accelerators/accelerator_table.h"
 #include "ash/ash_switches.h"
 #include "ash/caps_lock_delegate.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_controller.h"
@@ -375,10 +374,6 @@ void AcceleratorController::Init() {
 
   RegisterAccelerators(kAcceleratorData, kAcceleratorDataLength);
 
-#if !defined(NDEBUG)
-  RegisterAccelerators(kDesktopAcceleratorData, kDesktopAcceleratorDataLength);
-#endif
-
   if (DebugShortcutsEnabled())
     RegisterAccelerators(kDebugAcceleratorData, kDebugAcceleratorDataLength);
 
@@ -819,18 +814,9 @@ bool AcceleratorController::PerformAction(int action,
       return HandleToggleDesktopBackgroundMode();
     case TOGGLE_ROOT_WINDOW_FULL_SCREEN:
       return HandleToggleRootWindowFullScreen();
-    case DEBUG_TOGGLE_DEVICE_SCALE_FACTOR:
+    case DISPLAY_TOGGLE_SCALE:
       internal::DisplayManager::ToggleDisplayScaleFactor();
       return true;
-    case DEBUG_TOGGLE_SHOW_DEBUG_BORDERS:
-      ash::debug::ToggleShowDebugBorders();
-      return true;
-    case DEBUG_TOGGLE_SHOW_FPS_COUNTER:
-      ash::debug::ToggleShowFpsCounter();
-      return true;
-    case DEBUG_TOGGLE_SHOW_PAINT_RECTS:
-      ash::debug::ToggleShowPaintRects();
-      return true;
     case MAGNIFY_SCREEN_ZOOM_IN:
       return HandleMagnifyScreen(1);
     case MAGNIFY_SCREEN_ZOOM_OUT:
diff --git a/ash/accelerators/accelerator_table.cc b/ash/accelerators/accelerator_table.cc
index 315556d..9daa8b1 100644
--- a/ash/accelerators/accelerator_table.cc
+++ b/ash/accelerators/accelerator_table.cc
@@ -64,6 +64,23 @@ const AcceleratorData kAcceleratorData[] = {
   { false, ui::VKEY_F13, ui::EF_NONE, LOCK_RELEASED },
   { true, ui::VKEY_POWER, ui::EF_NONE, POWER_PRESSED },
   { false, ui::VKEY_POWER, ui::EF_NONE, POWER_RELEASED },
+#if !defined(NDEBUG)
+  // Extra shortcut for debug build to control magnifier on linux desktop.
+  { true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_CONTROL_DOWN,
+    MAGNIFY_SCREEN_ZOOM_OUT},
+  { true, ui::VKEY_BRIGHTNESS_UP, ui::EF_CONTROL_DOWN, MAGNIFY_SCREEN_ZOOM_IN},
+  // Extra shortcut for debug build to activate lock screen on linux desktop.
+  { true, ui::VKEY_L, ui::EF_ALT_DOWN, LOCK_SCREEN },
+  // Extra shortcut for display swaping as alt-f4 is taken on linux desktop.
+  { true, ui::VKEY_F4, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN,
+    SWAP_PRIMARY_DISPLAY },
+  // Extra shortcut to lock the screen on linux desktop.
+  { true, ui::VKEY_POWER, ui::EF_SHIFT_DOWN, LOCK_PRESSED },
+  { false, ui::VKEY_POWER, ui::EF_SHIFT_DOWN, LOCK_RELEASED },
+  // Extra shortcut to rotate/scale up/down the screen on linux desktop.
+  { true, ui::VKEY_R,
+    ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, ROTATE_SCREEN },
+#endif  // !defined(NDEBUG)
   { true, ui::VKEY_O, ui::EF_CONTROL_DOWN, OPEN_FILE_DIALOG },
   { true, ui::VKEY_M, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN,
     OPEN_FILE_MANAGER },
@@ -164,52 +181,25 @@ const AcceleratorData kAcceleratorData[] = {
 
 const size_t kAcceleratorDataLength = arraysize(kAcceleratorData);
 
-#if !defined(NDEBUG)
-const AcceleratorData kDesktopAcceleratorData[] = {
-  // Extra shortcut for debug build to control magnifier on linux desktop.
-  { true, ui::VKEY_BRIGHTNESS_DOWN, ui::EF_CONTROL_DOWN,
-    MAGNIFY_SCREEN_ZOOM_OUT},
-  { true, ui::VKEY_BRIGHTNESS_UP, ui::EF_CONTROL_DOWN, MAGNIFY_SCREEN_ZOOM_IN},
-  // Extra shortcut for debug build to activate lock screen on linux desktop.
-  { true, ui::VKEY_L, ui::EF_ALT_DOWN, LOCK_SCREEN },
-  // Extra shortcut for display swaping as alt-f4 is taken on linux desktop.
-  { true, ui::VKEY_S, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
-    SWAP_PRIMARY_DISPLAY },
-  // Extra shortcut to lock the screen on linux desktop.
-  { true, ui::VKEY_POWER, ui::EF_SHIFT_DOWN, LOCK_PRESSED },
-  { false, ui::VKEY_POWER, ui::EF_SHIFT_DOWN, LOCK_RELEASED },
-  // Extra shortcut to rotate/scale up/down the screen on linux desktop.
-  { true, ui::VKEY_R,
-    ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, ROTATE_SCREEN },
-  // For testing on systems where Alt-Tab is already mapped.
-  { true, ui::VKEY_W, ui::EF_ALT_DOWN, CYCLE_FORWARD_MRU },
-
+const AcceleratorData kDebugAcceleratorData[] = {
+  { true, ui::VKEY_B, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
+    TOGGLE_DESKTOP_BACKGROUND_MODE },
   { true, ui::VKEY_F11, ui::EF_CONTROL_DOWN, TOGGLE_ROOT_WINDOW_FULL_SCREEN },
   { true, ui::VKEY_W, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, TOGGLE_WIFI },
+  // 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_B, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
-    TOGGLE_DESKTOP_BACKGROUND_MODE },
-};
-
-const size_t kDesktopAcceleratorDataLength = arraysize(kDesktopAcceleratorData);
-#endif
-
-const AcceleratorData kDebugAcceleratorData[] = {
+  { true, ui::VKEY_HOME, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
+    DISPLAY_TOGGLE_SCALE },
+#if !defined(NDEBUG)
   { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
     PRINT_LAYER_HIERARCHY },
   { true, ui::VKEY_V, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
     PRINT_VIEW_HIERARCHY },
   { true, ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
     PRINT_WINDOW_HIERARCHY },
-  { true, ui::VKEY_S, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
-    DEBUG_TOGGLE_DEVICE_SCALE_FACTOR },
-  { true, ui::VKEY_B, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
-    DEBUG_TOGGLE_SHOW_DEBUG_BORDERS },
-  { true, ui::VKEY_F, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
-    DEBUG_TOGGLE_SHOW_FPS_COUNTER },
-  { true, ui::VKEY_P, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
-    DEBUG_TOGGLE_SHOW_PAINT_RECTS },
+#endif
 };
 
 const size_t kDebugAcceleratorDataLength = arraysize(kDebugAcceleratorData);
@@ -229,6 +219,10 @@ const size_t kReservedActionsLength = arraysize(kReservedActions);
 const AcceleratorAction kActionsAllowedAtLoginOrLockScreen[] = {
   BRIGHTNESS_DOWN,
   BRIGHTNESS_UP,
+#if defined(OS_CHROMEOS)
+  CYCLE_DISPLAY_MODE,
+  DISABLE_GPU_WATCHDOG,
+#endif  // defined(OS_CHROMEOS)
   DISABLE_CAPS_LOCK,
   KEYBOARD_BRIGHTNESS_DOWN,
   KEYBOARD_BRIGHTNESS_UP,
@@ -236,14 +230,10 @@ const AcceleratorAction kActionsAllowedAtLoginOrLockScreen[] = {
   MAGNIFY_SCREEN_ZOOM_OUT,  // Control+F6
   NEXT_IME,
   PREVIOUS_IME,
-  PRINT_LAYER_HIERARCHY,
   PRINT_UI_HIERARCHIES,
-  PRINT_VIEW_HIERARCHY,
-  PRINT_WINDOW_HIERARCHY,
-  ROTATE_WINDOW,
   SWITCH_IME,  // Switch to another IME depending on the accelerator.
-  TAKE_PARTIAL_SCREENSHOT,
   TAKE_SCREENSHOT,
+  TAKE_PARTIAL_SCREENSHOT,
   TOGGLE_CAPS_LOCK,
   TOGGLE_SPOKEN_FEEDBACK,
   TOGGLE_WIFI,
@@ -251,14 +241,16 @@ const AcceleratorAction kActionsAllowedAtLoginOrLockScreen[] = {
   VOLUME_DOWN,
   VOLUME_MUTE,
   VOLUME_UP,
-#if defined(OS_CHROMEOS)
-  CYCLE_DISPLAY_MODE,
-  DISABLE_GPU_WATCHDOG,
+  ROTATE_WINDOW,
+#if !defined(NDEBUG)
+  PRINT_LAYER_HIERARCHY,
+  PRINT_VIEW_HIERARCHY,
+  PRINT_WINDOW_HIERARCHY,
 #endif
 #if defined(OS_CHROMEOS) && !defined(NDEBUG)
   POWER_PRESSED,
   POWER_RELEASED,
-#endif  // defined(OS_CHROMEOS)
+#endif
 };
 
 const size_t kActionsAllowedAtLoginOrLockScreenLength =
@@ -292,8 +284,8 @@ const AcceleratorAction kActionsAllowedAtModalWindow[] = {
   SHOW_KEYBOARD_OVERLAY,
   SWAP_PRIMARY_DISPLAY,
   SWITCH_IME,
-  TAKE_PARTIAL_SCREENSHOT,
   TAKE_SCREENSHOT,
+  TAKE_PARTIAL_SCREENSHOT,
   TOGGLE_CAPS_LOCK,
   TOGGLE_SPOKEN_FEEDBACK,
   TOGGLE_WIFI,
@@ -318,9 +310,9 @@ const AcceleratorAction kNonrepeatableActions[] = {
   PRINT_UI_HIERARCHIES,  // Don't fill the logs if the key is held down.
   ROTATE_SCREEN,
   ROTATE_WINDOW,
+  SCALE_UI_UP,
   SCALE_UI_DOWN,
   SCALE_UI_RESET,
-  SCALE_UI_UP,
   TOGGLE_MAXIMIZED,
   WINDOW_MINIMIZE,
 };
@@ -331,6 +323,10 @@ const size_t kNonrepeatableActionsLength =
 const AcceleratorAction kActionsAllowedInAppMode[] = {
   BRIGHTNESS_DOWN,
   BRIGHTNESS_UP,
+#if defined(OS_CHROMEOS)
+  CYCLE_DISPLAY_MODE,
+  DISABLE_GPU_WATCHDOG,
+#endif  // defined(OS_CHROMEOS)
   DISABLE_CAPS_LOCK,
   KEYBOARD_BRIGHTNESS_DOWN,
   KEYBOARD_BRIGHTNESS_UP,
@@ -343,14 +339,11 @@ const AcceleratorAction kActionsAllowedInAppMode[] = {
   POWER_PRESSED,
   POWER_RELEASED,
   PREVIOUS_IME,
-  PRINT_LAYER_HIERARCHY,
   PRINT_UI_HIERARCHIES,
-  PRINT_VIEW_HIERARCHY,
-  PRINT_WINDOW_HIERARCHY,
   ROTATE_SCREEN,
+  SCALE_UI_UP,
   SCALE_UI_DOWN,
   SCALE_UI_RESET,
-  SCALE_UI_UP,
   SWAP_PRIMARY_DISPLAY,
   SWITCH_IME,  // Switch to another IME depending on the accelerator.
   TOGGLE_CAPS_LOCK,
@@ -360,10 +353,11 @@ const AcceleratorAction kActionsAllowedInAppMode[] = {
   VOLUME_DOWN,
   VOLUME_MUTE,
   VOLUME_UP,
-#if defined(OS_CHROMEOS)
-  CYCLE_DISPLAY_MODE,
-  DISABLE_GPU_WATCHDOG,
-#endif  // defined(OS_CHROMEOS)
+#if !defined(NDEBUG)
+  PRINT_LAYER_HIERARCHY,
+  PRINT_VIEW_HIERARCHY,
+  PRINT_WINDOW_HIERARCHY,
+#endif
 };
 
 const size_t kActionsAllowedInAppModeLength =
diff --git a/ash/accelerators/accelerator_table.h b/ash/accelerators/accelerator_table.h
index 0666861..b28e4e9 100644
--- a/ash/accelerators/accelerator_table.h
+++ b/ash/accelerators/accelerator_table.h
@@ -21,11 +21,8 @@ enum AcceleratorAction {
   CYCLE_BACKWARD_MRU,
   CYCLE_FORWARD_LINEAR,
   CYCLE_FORWARD_MRU,
-  DEBUG_TOGGLE_DEVICE_SCALE_FACTOR,
-  DEBUG_TOGGLE_SHOW_DEBUG_BORDERS,
-  DEBUG_TOGGLE_SHOW_FPS_COUNTER,
-  DEBUG_TOGGLE_SHOW_PAINT_RECTS,
   DISABLE_CAPS_LOCK,
+  DISPLAY_TOGGLE_SCALE,
   EXIT,
   FOCUS_LAUNCHER,
   FOCUS_NEXT_PANE,
@@ -44,13 +41,10 @@ enum AcceleratorAction {
   NEW_WINDOW,
   NEXT_IME,
   OPEN_FEEDBACK_PAGE,
+  PREVIOUS_IME,
   POWER_PRESSED,
   POWER_RELEASED,
-  PREVIOUS_IME,
-  PRINT_LAYER_HIERARCHY,
   PRINT_UI_HIERARCHIES,
-  PRINT_VIEW_HIERARCHY,
-  PRINT_WINDOW_HIERARCHY,
   RESTORE_TAB,
   ROTATE_SCREEN,
   ROTATE_WINDOW,
@@ -94,11 +88,16 @@ enum AcceleratorAction {
   WINDOW_SNAP_RIGHT,
 #if defined(OS_CHROMEOS)
   CYCLE_DISPLAY_MODE,
-  DISABLE_GPU_WATCHDOG,
   LOCK_SCREEN,
   OPEN_CROSH,
   OPEN_FILE_DIALOG,  // Open 'Open file' dialog.
   OPEN_FILE_MANAGER,
+  DISABLE_GPU_WATCHDOG,
+#endif
+#if !defined(NDEBUG)
+  PRINT_LAYER_HIERARCHY,
+  PRINT_VIEW_HIERARCHY,
+  PRINT_WINDOW_HIERARCHY,
 #endif
 };
 
@@ -115,14 +114,6 @@ ASH_EXPORT extern const AcceleratorData kAcceleratorData[];
 // The number of elements in kAcceleratorData.
 ASH_EXPORT extern const size_t kAcceleratorDataLength;
 
-#if !defined(NDEBUG)
-// Accelerators useful when running on desktop. Debug build only.
-ASH_EXPORT extern const AcceleratorData kDesktopAcceleratorData[];
-
-// The number of elements in kDesktopAcceleratorData.
-ASH_EXPORT extern const size_t kDesktopAcceleratorDataLength;
-#endif
-
 // Debug accelerators enabled only when "Debugging keyboard shortcuts" flag
 // (--ash-debug-shortcuts) is enabled.
 ASH_EXPORT extern const AcceleratorData kDebugAcceleratorData[];
diff --git a/ash/ash.gyp b/ash/ash.gyp
index 2300949..b46d9da 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -70,8 +70,6 @@
         'caps_lock_delegate.h',
         'caps_lock_delegate_stub.cc',
         'caps_lock_delegate_stub.h',
-        'debug.cc',
-        'debug.h',
         'desktop_background/desktop_background_controller.cc',
         'desktop_background/desktop_background_controller.h',
         'desktop_background/desktop_background_controller_observer.h',
diff --git a/ash/debug.cc b/ash/debug.cc
deleted file mode 100644
index 060627c..0000000
--- a/ash/debug.cc
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright (c) 2013 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/debug.h"
-
-#include "ash/shell.h"
-#include "cc/debug/layer_tree_debug_state.h"
-#include "ui/aura/root_window.h"
-#include "ui/compositor/compositor.h"
-
-namespace ash {
-namespace debug {
-
-void ToggleShowDebugBorders() {
-  Shell::RootWindowList root_windows =
-      Shell::GetInstance()->GetAllRootWindows();
-  scoped_ptr<bool> value;
-  for (Shell::RootWindowList::iterator it = root_windows.begin();
-       it != root_windows.end(); ++it) {
-    ui::Compositor* compositor = (*it)->compositor();
-    cc::LayerTreeDebugState state = compositor->GetLayerTreeDebugState();
-    if (!value.get())
-      value.reset(new bool(!state.show_debug_borders));
-    state.show_debug_borders = *value.get();
-    compositor->SetLayerTreeDebugState(state);
-  }
-}
-
-void ToggleShowFpsCounter() {
-  Shell::RootWindowList root_windows =
-      Shell::GetInstance()->GetAllRootWindows();
-  scoped_ptr<bool> value;
-  for (Shell::RootWindowList::iterator it = root_windows.begin();
-       it != root_windows.end(); ++it) {
-    ui::Compositor* compositor = (*it)->compositor();
-    cc::LayerTreeDebugState state = compositor->GetLayerTreeDebugState();
-    if (!value.get())
-      value.reset(new bool(!state.show_fps_counter));
-    state.show_fps_counter = *value.get();
-    compositor->SetLayerTreeDebugState(state);
-  }
-}
-
-void ToggleShowPaintRects() {
-  Shell::RootWindowList root_windows =
-      Shell::GetInstance()->GetAllRootWindows();
-  scoped_ptr<bool> value;
-  for (Shell::RootWindowList::iterator it = root_windows.begin();
-       it != root_windows.end(); ++it) {
-    ui::Compositor* compositor = (*it)->compositor();
-    cc::LayerTreeDebugState state = compositor->GetLayerTreeDebugState();
-    if (!value.get())
-      value.reset(new bool(!state.show_paint_rects));
-    state.show_paint_rects = *value.get();
-    compositor->SetLayerTreeDebugState(state);
-  }
-}
-
-}  // debug
-}  // ash
diff --git a/ash/debug.h b/ash/debug.h
deleted file mode 100644
index 1b2561e..0000000
--- a/ash/debug.h
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) 2013 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.
-
-#ifndef ASH_DEBUG_H_
-#define ASH_DEBUG_H_
-
-#include "ash/ash_export.h"
-
-namespace ash {
-namespace debug {
-
-// Toggles debugging features controlled by
-// cc::LayerTreeDebugState.
-ASH_EXPORT void ToggleShowPaintRects();
-ASH_EXPORT void ToggleShowDebugBorders();
-ASH_EXPORT void ToggleShowFpsCounter();
-
-}  // debug
-}  // ash
-
-#endif  // ASH_DEBUG_H_
diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc
index 8477cfb..6f65e8a 100644
--- a/ui/compositor/compositor.cc
+++ b/ui/compositor/compositor.cc
@@ -757,15 +757,6 @@ Compositor::OffscreenContextProviderForCompositorThread() {
       OffscreenContextProviderForCompositorThread();
 }
 
-const cc::LayerTreeDebugState& Compositor::GetLayerTreeDebugState() const {
-  return host_->debug_state();
-}
-
-void Compositor::SetLayerTreeDebugState(
-    const cc::LayerTreeDebugState& debug_state) {
-  host_->SetDebugState(debug_state);
-}
-
 scoped_refptr<CompositorLock> Compositor::GetCompositorLock() {
   if (!compositor_lock_) {
     compositor_lock_ = new CompositorLock(this);
diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h
index 10c6979..5777d65 100644
--- a/ui/compositor/compositor.h
+++ b/ui/compositor/compositor.h
@@ -31,7 +31,6 @@ class RunLoop;
 namespace cc {
 class ContextProvider;
 class Layer;
-class LayerTreeDebugState;
 class LayerTreeHost;
 }
 
@@ -364,9 +363,6 @@ class COMPOSITOR_EXPORT Compositor
 
   bool IsLocked() { return compositor_lock_ != NULL; }
 
-  const cc::LayerTreeDebugState& GetLayerTreeDebugState() const;
-  void SetLayerTreeDebugState(const cc::LayerTreeDebugState& debug_state);
-
  private:
   friend class base::RefCounted<Compositor>;
   friend class CompositorLock;