Disable ctrl-alt-shift-w on beta/stable channels.

chrome/browser/chromeos/login/ui/webui_login_view.cc

Index: chrome/browser/chromeos/login/ui/webui_login_view.cc
diff --git a/chrome/browser/chromeos/login/ui/webui_login_view.cc b/chrome/browser/chromeos/login/ui/webui_login_view.cc
index b03a8a3362b79e709883920d1719c15067231f86..65b2c75fcb42aa20f6fed4507b9b4d90cb94da78 100644
--- a/chrome/browser/chromeos/login/ui/webui_login_view.cc
+++ b/chrome/browser/chromeos/login/ui/webui_login_view.cc
@@ -26,6 +26,7 @@
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/ui/autofill/chrome_autofill_client.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
+#include "chrome/common/chrome_version_info.h"
 #include "chrome/common/render_messages.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/session_manager_client.h"
@@ -131,9 +132,6 @@ WebUILoginView::WebUILoginView()
   accel_map_[ui::Accelerator(ui::VKEY_X,
       ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN)] =
       kAccelNameEnableDebugging;
-  accel_map_[ui::Accelerator(ui::VKEY_W,
-      ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN)] =
-      kAccelNameToggleWebviewSignin;
   accel_map_[ui::Accelerator(
       ui::VKEY_L, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN)] =
       kAccelNameToggleNewLoginUI;
@@ -146,6 +144,16 @@ WebUILoginView::WebUILoginView()
   accel_map_[ui::Accelerator(ui::VKEY_RIGHT, ui::EF_NONE)] =
       kAccelFocusNext;
 
+  // Ctrl-Alt-Shift-W for canary/dev builds only.
+  const chrome::VersionInfo::Channel channel =
+      chrome::VersionInfo::GetChannel();
+  if (channel != chrome::VersionInfo::CHANNEL_STABLE &&
+      channel != chrome::VersionInfo::CHANNEL_BETA) {
+    accel_map_[ui::Accelerator(
+        ui::VKEY_W, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN |
+                        ui::EF_SHIFT_DOWN)] = kAccelNameToggleWebviewSignin;
+  }
+
   // Use KEY_RELEASED because Gaia consumes KEY_PRESSED for up/down key.
   ui::Accelerator key_up(ui::VKEY_UP, ui::EF_NONE);
   key_up.set_type(ui::ET_KEY_RELEASED);