Add a CanHandleAccelerators() method to AcceleratorTarget.

This eliminates the need to register/unregister accelerators based on visibility state changes from views.

BUG=105734
TEST=unit tests

Review URL: http://codereview.chromium.org/8589007

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

1 files changed, 8 insertions, 10 deletions

diff --git a/ui/views/view_unittest.cc b/ui/views/view_unittest.cc
index 8d68d2c..739d393 100644
--- a/ui/views/view_unittest.cc
+++ b/ui/views/view_unittest.cc
@@ -1058,12 +1058,10 @@ TEST_F(ViewTest, HiddenViewWithAccelerator) {
   ASSERT_TRUE(focus_manager);
 
   view->SetVisible(false);
-  EXPECT_EQ(NULL,
-            focus_manager->GetCurrentTargetForAccelerator(return_accelerator));
+  EXPECT_FALSE(focus_manager->ProcessAccelerator(return_accelerator));
 
   view->SetVisible(true);
-  EXPECT_EQ(view,
-            focus_manager->GetCurrentTargetForAccelerator(return_accelerator));
+  EXPECT_TRUE(focus_manager->ProcessAccelerator(return_accelerator));
 
   widget->CloseNow();
 }
@@ -1088,16 +1086,16 @@ TEST_F(ViewTest, ViewInHiddenWidgetWithAccelerator) {
   FocusManager* focus_manager = widget->GetFocusManager();
   ASSERT_TRUE(focus_manager);
 
-  EXPECT_EQ(NULL,
-            focus_manager->GetCurrentTargetForAccelerator(return_accelerator));
+  EXPECT_FALSE(focus_manager->ProcessAccelerator(return_accelerator));
+  EXPECT_EQ(0, view->accelerator_count_map_[return_accelerator]);
 
   widget->Show();
-  EXPECT_EQ(view,
-            focus_manager->GetCurrentTargetForAccelerator(return_accelerator));
+  EXPECT_TRUE(focus_manager->ProcessAccelerator(return_accelerator));
+  EXPECT_EQ(1, view->accelerator_count_map_[return_accelerator]);
 
   widget->Hide();
-  EXPECT_EQ(NULL,
-            focus_manager->GetCurrentTargetForAccelerator(return_accelerator));
+  EXPECT_FALSE(focus_manager->ProcessAccelerator(return_accelerator));
+  EXPECT_EQ(1, view->accelerator_count_map_[return_accelerator]);
 
   widget->CloseNow();
 }