[Mac] Add text-editing accelerators to 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"
@@ skipping 98 matching lines @@
 }
 
 void UserManagerView::Init(
     const base::FilePath& profile_path_to_focus,
     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);
+
+  // Only handle close window accelerators or accelerators that make sense in
+  // the locked pod password field.
   AddAccelerator(ui::Accelerator(ui::VKEY_W, ui::EF_CONTROL_DOWN));
 
   // If the user manager is being displayed from an existing profile, use
   // its last active browser to determine where the user manager should be
   // placed.  This is used so that we can center the dialog on the correct
   // monitor in a multiple-monitor setup.
   //
   // If |profile_path_to_focus| is empty (for example, starting up chrome
   // when all existing profiles are locked) or we can't find an active
   // browser, bounds will remain empty and the user manager will be centered on
@@ skipping 32 matching lines @@
           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;
+
+  // Handle the close window accelerator, and let the WebView handle the rest.
+  if (accelerator.key_code() == ui::VKEY_W) {

[sky, 2014/09/10 16:21:15]

How do you end up here for other accelerator types? AFAICT you only register
control-w.

[noms (inactive), 2014/09/10 16:55:09]

Oh weird, you're right. This seems to work without any changes. I probably had
broken it first, which is why this no-op appeared to work. Thanks for catching
it :/

On 2014/09/10 16:21:15, sky wrote:

+    GetWidget()->Close();
+    return true;
+  }
+  return false;
 }
 
 gfx::Size UserManagerView::GetPreferredSize() const {
   return gfx::Size(kWindowWidth, kWindowHeight);
 }
 
 bool UserManagerView::CanResize() const {
   return true;
 }
 
@@ skipping 13 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;
 }