[Win] Ctrl+W should close the User Manager

chrome/browser/ui/views/profiles/user_manager_view.cc

 // Copyright 2014 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 "chrome/browser/ui/views/profiles/user_manager_view.h"
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profile_metrics.h"
 #include "chrome/browser/profiles/profile_window.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/views/auto_keep_alive.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/controls/webview/webview.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
+#include "ui/views/window/dialog_client_view.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/shell_integration.h"
 #include "ui/base/win/shell.h"
 #include "ui/views/win/hwnd_util.h"
 #endif
 
 namespace {
 
 // Default window size.
@@ skipping 65 matching lines @@
 void UserManagerView::OnGuestProfileCreated(
     scoped_ptr<UserManagerView> instance,
     Profile* guest_profile,
     const std::string& url) {
   instance_ = instance.release();  // |instance_| takes over ownership.
   instance_->Init(guest_profile, GURL(url));
 }
 
 void UserManagerView::Init(Profile* guest_profile, const GURL& url) {
   web_view_ = new views::WebView(guest_profile);
+  web_view_->set_allow_accelerators(true);
+  AddChildView(web_view_);
   SetLayoutManager(new views::FillLayout);
-  AddChildView(web_view_);
+  AddAccelerator(ui::Accelerator(ui::VKEY_W, ui::EF_CONTROL_DOWN));
 
   DialogDelegate::CreateDialogWidget(this, NULL, NULL);
+  GetDialogClientView()->RemoveAccelerator(

[msw, 2014/07/09 17:07:03]

nit: add a comment explaining why Esc shouldn't close the window.

[noms (inactive), 2014/07/09 17:15:09]

Done.

+      ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE));
 
 #if defined(OS_WIN)
   // Set the app id for the task manager to the app id of its parent
   ui::win::SetAppIdForWindow(
       ShellIntegration::GetChromiumModelIdForProfile(
           guest_profile->GetPath()),
       views::HWNDForWidget(GetWidget()));
 #endif
   GetWidget()->Show();
 
   web_view_->LoadInitialURL(url);
   web_view_->RequestFocus();
 }
 
+bool UserManagerView::AcceleratorPressed(const ui::Accelerator& accelerator) {
+  DCHECK_EQ(ui::VKEY_W, accelerator.key_code());
+  DCHECK_EQ(ui::EF_CONTROL_DOWN, accelerator.modifiers());
+  GetWidget()->Close();
+  return true;
+}
+
 gfx::Size UserManagerView::GetPreferredSize() const {
   return gfx::Size(kWindowWidth, kWindowHeight);
 }
 
 bool UserManagerView::CanResize() const {
   return true;
 }
 
 bool UserManagerView::CanMaximize() const {
   return true;
@@ skipping 11 matching lines @@
   // Now that the window is closed, we can allow a new one to be opened.
   // (WindowClosing comes in asynchronously from the call to Close() and we
   // may have already opened a new instance).
   if (instance_ == this)
     instance_ = NULL;
 }
 
 bool UserManagerView::UseNewStyleForThisDialog() const {
   return false;
 }