Handle dialog acclerators explicitly; nix default button switching.

ui/views/view_unittest.cc

 // Copyright (c) 2012 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 <map>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/rand_util.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 1693 matching lines @@
         static_cast<DialogClientView*>(window->client_view());
     ok_button_ = client_view_->ok_button();
     cancel_button_ = client_view_->cancel_button();
   }
 
   virtual void TearDown() OVERRIDE {
     test_dialog_->TearDown();
     ViewTest::TearDown();
   }
 
-  void SimulatePressingEnterAndCheckDefaultButton(ButtonID button_id) {
+  void SimulatePressingEnterAndCheckHandledButton(ButtonID button_id) {
     ui::KeyEvent event(ui::ET_KEY_PRESSED, ui::VKEY_RETURN, 0, false);
     focus_manager_->OnKeyEvent(event);
     switch (button_id) {
       case OK:
         EXPECT_TRUE(test_dialog_->oked_);
         EXPECT_FALSE(test_dialog_->canceled_);
         EXPECT_FALSE(test_dialog_->last_pressed_button_);
         break;
       case CANCEL:
         EXPECT_FALSE(test_dialog_->oked_);
@@ skipping 17 matching lines @@
   }
 
   FocusManager* focus_manager_;
   TestDialog* test_dialog_;
   DialogClientView* client_view_;
   LabelButton* ok_button_;
   LabelButton* cancel_button_;
 };
 
 TEST_F(DefaultButtonTest, DialogDefaultButtonTest) {
-  // Window has just been shown, we expect the default button specified in the
-  // DialogDelegate.
-  EXPECT_TRUE(ok_button_->is_default());
-
-  // Simulate pressing enter, that should trigger the OK button.
-  SimulatePressingEnterAndCheckDefaultButton(OK);
-
-  // Simulate focusing another button, it should become the default button.
-  client_view_->OnWillChangeFocus(ok_button_, test_dialog_->button1_);
-  EXPECT_FALSE(ok_button_->is_default());
-  EXPECT_TRUE(test_dialog_->button1_->is_default());
-  // Simulate pressing enter, that should trigger button1.
-  SimulatePressingEnterAndCheckDefaultButton(BUTTON1);
-
-  // Now select something that is not a button, the OK should become the default
-  // button again.
-  client_view_->OnWillChangeFocus(test_dialog_->button1_,
-                                  test_dialog_->checkbox_);
-  EXPECT_TRUE(ok_button_->is_default());
-  EXPECT_FALSE(test_dialog_->button1_->is_default());
-  SimulatePressingEnterAndCheckDefaultButton(OK);
-
-  // Select yet another button.
-  client_view_->OnWillChangeFocus(test_dialog_->checkbox_,
-                                  test_dialog_->button2_);
-  EXPECT_FALSE(ok_button_->is_default());
-  EXPECT_FALSE(test_dialog_->button1_->is_default());
-  EXPECT_TRUE(test_dialog_->button2_->is_default());
-  SimulatePressingEnterAndCheckDefaultButton(BUTTON2);
-
-  // Focus nothing.
-  client_view_->OnWillChangeFocus(test_dialog_->button2_, NULL);
+  // The dialog should initially honor the delegate's specified default button.
   EXPECT_TRUE(ok_button_->is_default());
   EXPECT_FALSE(test_dialog_->button1_->is_default());
   EXPECT_FALSE(test_dialog_->button2_->is_default());
-  SimulatePressingEnterAndCheckDefaultButton(OK);
+
+  // Simulate pressing enter, that should trigger the OK button.
+  SimulatePressingEnterAndCheckHandledButton(OK);
+
+  // Focusing another button changes enter handling, but not the default button.
+  FocusManager* focus_manager = client_view_->GetFocusManager();
+  focus_manager->SetFocusedView(test_dialog_->button1_);
+  EXPECT_TRUE(ok_button_->is_default());
+  EXPECT_FALSE(test_dialog_->button1_->is_default());
+  EXPECT_FALSE(test_dialog_->button2_->is_default());
+  // Simulate pressing enter, that should trigger button1.
+  SimulatePressingEnterAndCheckHandledButton(BUTTON1);
+
+  // Focusing a non-button view invokes OK.
+  focus_manager->SetFocusedView(test_dialog_->checkbox_);
+  EXPECT_TRUE(ok_button_->is_default());
+  EXPECT_FALSE(test_dialog_->button1_->is_default());
+  EXPECT_FALSE(test_dialog_->button2_->is_default());
+  SimulatePressingEnterAndCheckHandledButton(OK);
+
+  // Focus yet another button.
+  focus_manager->SetFocusedView(test_dialog_->button2_);
+  EXPECT_TRUE(ok_button_->is_default());
+  EXPECT_FALSE(test_dialog_->button1_->is_default());
+  EXPECT_FALSE(test_dialog_->button2_->is_default());
+  SimulatePressingEnterAndCheckHandledButton(BUTTON2);
+
+  // Focus nothing.
+  focus_manager->ClearFocus();
+  EXPECT_TRUE(ok_button_->is_default());
+  EXPECT_FALSE(test_dialog_->button1_->is_default());
+  EXPECT_FALSE(test_dialog_->button2_->is_default());
+  SimulatePressingEnterAndCheckHandledButton(OK);
 
   // Focus the cancel button.
-  client_view_->OnWillChangeFocus(NULL, cancel_button_);
-  EXPECT_FALSE(ok_button_->is_default());
-  EXPECT_TRUE(cancel_button_->is_default());
+  focus_manager->SetFocusedView(cancel_button_);
+  EXPECT_TRUE(ok_button_->is_default());
   EXPECT_FALSE(test_dialog_->button1_->is_default());
   EXPECT_FALSE(test_dialog_->button2_->is_default());
-  SimulatePressingEnterAndCheckDefaultButton(CANCEL);
+  SimulatePressingEnterAndCheckHandledButton(CANCEL);
 }
 
 class ButtonDropDownTest : public ViewTest {
  public:
   ButtonDropDownTest()
       : test_dialog_(NULL),
         button_as_view_(NULL) {
   }
 
   virtual void SetUp() OVERRIDE {
@@ skipping 1558 matching lines @@
   // Set to non default value.
   v->layer()->set_scale_content(false);
   scoped_ptr<ui::Layer> old_layer(v->RecreateLayer());
   ui::Layer* new_layer = v->layer();
   EXPECT_FALSE(new_layer->scale_content());
 }
 
 #endif  // USE_AURA
 
 }  // namespace views