MacViews: Fix duplicate definition of ExtensionKeyBindingRegistry::SetShortcutHandlingSuspended

ui/views/focus/focus_manager_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 "ui/views/focus/focus_manager.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 179 matching lines @@
 
 TEST_F(FocusManagerTest, CallsNormalAcceleratorTarget) {
   FocusManager* focus_manager = GetFocusManager();
   ui::Accelerator return_accelerator(ui::VKEY_RETURN, ui::EF_NONE);
   ui::Accelerator escape_accelerator(ui::VKEY_ESCAPE, ui::EF_NONE);
 
   TestAcceleratorTarget return_target(true);
   TestAcceleratorTarget escape_target(true);
   EXPECT_EQ(return_target.accelerator_count(), 0);
   EXPECT_EQ(escape_target.accelerator_count(), 0);
-  EXPECT_EQ(NULL,
-            focus_manager->GetCurrentTargetForAccelerator(return_accelerator));
-  EXPECT_EQ(NULL,
-            focus_manager->GetCurrentTargetForAccelerator(escape_accelerator));
+  EXPECT_EQ(NULL, focus_manager->GetTargetForAccelerator(return_accelerator));
+  EXPECT_EQ(NULL, focus_manager->GetTargetForAccelerator(escape_accelerator));
 
   // Register targets.
   focus_manager->RegisterAccelerator(return_accelerator,
                                      ui::AcceleratorManager::kNormalPriority,
                                      &return_target);
   focus_manager->RegisterAccelerator(escape_accelerator,
                                      ui::AcceleratorManager::kNormalPriority,
                                      &escape_target);
 
   // Checks if the correct target is registered.
   EXPECT_EQ(&return_target,
-            focus_manager->GetCurrentTargetForAccelerator(return_accelerator));
+            focus_manager->GetTargetForAccelerator(return_accelerator));
   EXPECT_EQ(&escape_target,
-            focus_manager->GetCurrentTargetForAccelerator(escape_accelerator));
+            focus_manager->GetTargetForAccelerator(escape_accelerator));
 
   // Hitting the return key.
   EXPECT_TRUE(focus_manager->ProcessAccelerator(return_accelerator));
   EXPECT_EQ(return_target.accelerator_count(), 1);
   EXPECT_EQ(escape_target.accelerator_count(), 0);
 
   // Hitting the escape key.
   EXPECT_TRUE(focus_manager->ProcessAccelerator(escape_accelerator));
   EXPECT_EQ(return_target.accelerator_count(), 1);
   EXPECT_EQ(escape_target.accelerator_count(), 1);
 
   // Register another target for the return key.
   TestAcceleratorTarget return_target2(true);
   EXPECT_EQ(return_target2.accelerator_count(), 0);
   focus_manager->RegisterAccelerator(return_accelerator,
                                      ui::AcceleratorManager::kNormalPriority,
                                      &return_target2);
   EXPECT_EQ(&return_target2,
-            focus_manager->GetCurrentTargetForAccelerator(return_accelerator));
+            focus_manager->GetTargetForAccelerator(return_accelerator));
 
   // Hitting the return key; return_target2 has the priority.
   EXPECT_TRUE(focus_manager->ProcessAccelerator(return_accelerator));
   EXPECT_EQ(return_target.accelerator_count(), 1);
   EXPECT_EQ(return_target2.accelerator_count(), 1);
 
   // Register a target that does not process the accelerator event.
   TestAcceleratorTarget return_target3(false);
   EXPECT_EQ(return_target3.accelerator_count(), 0);
   focus_manager->RegisterAccelerator(return_accelerator,
                                      ui::AcceleratorManager::kNormalPriority,
                                      &return_target3);
   EXPECT_EQ(&return_target3,
-            focus_manager->GetCurrentTargetForAccelerator(return_accelerator));
+            focus_manager->GetTargetForAccelerator(return_accelerator));
 
   // Hitting the return key.
   // Since the event handler of return_target3 returns false, return_target2
   // should be called too.
   EXPECT_TRUE(focus_manager->ProcessAccelerator(return_accelerator));
   EXPECT_EQ(return_target.accelerator_count(), 1);
   EXPECT_EQ(return_target2.accelerator_count(), 2);
   EXPECT_EQ(return_target3.accelerator_count(), 1);
 
   // Unregister return_target2.
   focus_manager->UnregisterAccelerator(return_accelerator, &return_target2);
   EXPECT_EQ(&return_target3,
-            focus_manager->GetCurrentTargetForAccelerator(return_accelerator));
+            focus_manager->GetTargetForAccelerator(return_accelerator));
 
   // Hitting the return key. return_target3 and return_target should be called.
   EXPECT_TRUE(focus_manager->ProcessAccelerator(return_accelerator));
   EXPECT_EQ(return_target.accelerator_count(), 2);
   EXPECT_EQ(return_target2.accelerator_count(), 2);
   EXPECT_EQ(return_target3.accelerator_count(), 2);
 
   // Unregister targets.
   focus_manager->UnregisterAccelerator(return_accelerator, &return_target);
   focus_manager->UnregisterAccelerator(return_accelerator, &return_target3);
   focus_manager->UnregisterAccelerator(escape_accelerator, &escape_target);
 
   // Now there is no target registered.
-  EXPECT_EQ(NULL,
-            focus_manager->GetCurrentTargetForAccelerator(return_accelerator));
-  EXPECT_EQ(NULL,
-            focus_manager->GetCurrentTargetForAccelerator(escape_accelerator));
+  EXPECT_EQ(NULL, focus_manager->GetTargetForAccelerator(return_accelerator));
+  EXPECT_EQ(NULL, focus_manager->GetTargetForAccelerator(escape_accelerator));
 
   // Hitting the return key and the escape key. Nothing should happen.
   EXPECT_FALSE(focus_manager->ProcessAccelerator(return_accelerator));
   EXPECT_EQ(return_target.accelerator_count(), 2);
   EXPECT_EQ(return_target2.accelerator_count(), 2);
   EXPECT_EQ(return_target3.accelerator_count(), 2);
   EXPECT_FALSE(focus_manager->ProcessAccelerator(escape_accelerator));
   EXPECT_EQ(escape_target.accelerator_count(), 1);
 }
 
 TEST_F(FocusManagerTest, HighPriorityHandlers) {
   FocusManager* focus_manager = GetFocusManager();
   ui::Accelerator escape_accelerator(ui::VKEY_ESCAPE, ui::EF_NONE);
 
   TestAcceleratorTarget escape_target_high(true);
   TestAcceleratorTarget escape_target_normal(true);
   EXPECT_EQ(escape_target_high.accelerator_count(), 0);
   EXPECT_EQ(escape_target_normal.accelerator_count(), 0);
-  EXPECT_EQ(NULL,
-      focus_manager->GetCurrentTargetForAccelerator(escape_accelerator));
+  EXPECT_EQ(NULL, focus_manager->GetTargetForAccelerator(escape_accelerator));
   EXPECT_FALSE(focus_manager->HasPriorityHandler(escape_accelerator));
 
   // Register high priority target.
   focus_manager->RegisterAccelerator(escape_accelerator,
                                      ui::AcceleratorManager::kHighPriority,
                                      &escape_target_high);
   EXPECT_EQ(&escape_target_high,
-     focus_manager->GetCurrentTargetForAccelerator(escape_accelerator));
+            focus_manager->GetTargetForAccelerator(escape_accelerator));
   EXPECT_TRUE(focus_manager->HasPriorityHandler(escape_accelerator));
 
   // Hit the escape key.
   EXPECT_TRUE(focus_manager->ProcessAccelerator(escape_accelerator));
   EXPECT_EQ(escape_target_high.accelerator_count(), 1);
   EXPECT_EQ(escape_target_normal.accelerator_count(), 0);
 
   // Add a normal priority target and make sure it doesn't see the key.
   focus_manager->RegisterAccelerator(escape_accelerator,
                                      ui::AcceleratorManager::kNormalPriority,
                                      &escape_target_normal);
 
   // Checks if the correct target is registered (same as before, the high
   // priority one).
   EXPECT_EQ(&escape_target_high,
-      focus_manager->GetCurrentTargetForAccelerator(escape_accelerator));
+            focus_manager->GetTargetForAccelerator(escape_accelerator));
   EXPECT_TRUE(focus_manager->HasPriorityHandler(escape_accelerator));
 
   // Hit the escape key.
   EXPECT_TRUE(focus_manager->ProcessAccelerator(escape_accelerator));
   EXPECT_EQ(escape_target_high.accelerator_count(), 2);
   EXPECT_EQ(escape_target_normal.accelerator_count(), 0);
 
   // Unregister the high priority accelerator.
   focus_manager->UnregisterAccelerator(escape_accelerator, &escape_target_high);
   EXPECT_EQ(&escape_target_normal,
-      focus_manager->GetCurrentTargetForAccelerator(escape_accelerator));
+            focus_manager->GetTargetForAccelerator(escape_accelerator));
   EXPECT_FALSE(focus_manager->HasPriorityHandler(escape_accelerator));
 
   // Hit the escape key.
   EXPECT_TRUE(focus_manager->ProcessAccelerator(escape_accelerator));
   EXPECT_EQ(escape_target_high.accelerator_count(), 2);
   EXPECT_EQ(escape_target_normal.accelerator_count(), 1);
 
   // Add the high priority target back and make sure it starts seeing the key.
   focus_manager->RegisterAccelerator(escape_accelerator,
                                      ui::AcceleratorManager::kHighPriority,
                                      &escape_target_high);
   EXPECT_EQ(&escape_target_high,
-      focus_manager->GetCurrentTargetForAccelerator(escape_accelerator));
+            focus_manager->GetTargetForAccelerator(escape_accelerator));
   EXPECT_TRUE(focus_manager->HasPriorityHandler(escape_accelerator));
 
   // Hit the escape key.
   EXPECT_TRUE(focus_manager->ProcessAccelerator(escape_accelerator));
   EXPECT_EQ(escape_target_high.accelerator_count(), 3);
   EXPECT_EQ(escape_target_normal.accelerator_count(), 1);
 
   // Unregister the normal priority accelerator.
   focus_manager->UnregisterAccelerator(
       escape_accelerator, &escape_target_normal);
   EXPECT_EQ(&escape_target_high,
-      focus_manager->GetCurrentTargetForAccelerator(escape_accelerator));
+            focus_manager->GetTargetForAccelerator(escape_accelerator));
   EXPECT_TRUE(focus_manager->HasPriorityHandler(escape_accelerator));
 
   // Hit the escape key.
   EXPECT_TRUE(focus_manager->ProcessAccelerator(escape_accelerator));
   EXPECT_EQ(escape_target_high.accelerator_count(), 4);
   EXPECT_EQ(escape_target_normal.accelerator_count(), 1);
 
   // Unregister the high priority accelerator.
   focus_manager->UnregisterAccelerator(escape_accelerator, &escape_target_high);
-  EXPECT_EQ(NULL,
-      focus_manager->GetCurrentTargetForAccelerator(escape_accelerator));
+  EXPECT_EQ(NULL, focus_manager->GetTargetForAccelerator(escape_accelerator));
   EXPECT_FALSE(focus_manager->HasPriorityHandler(escape_accelerator));
 
   // Hit the escape key (no change, no targets registered).
   EXPECT_FALSE(focus_manager->ProcessAccelerator(escape_accelerator));
   EXPECT_EQ(escape_target_high.accelerator_count(), 4);
   EXPECT_EQ(escape_target_normal.accelerator_count(), 1);
 }
 
 TEST_F(FocusManagerTest, CallsEnabledAcceleratorTargetsOnly) {
   FocusManager* focus_manager = GetFocusManager();
@@ skipping 59 matching lines @@
   int accelerator_count_;
 
   DISALLOW_COPY_AND_ASSIGN(SelfUnregisteringAcceleratorTarget);
 };
 
 TEST_F(FocusManagerTest, CallsSelfDeletingAcceleratorTarget) {
   FocusManager* focus_manager = GetFocusManager();
   ui::Accelerator return_accelerator(ui::VKEY_RETURN, ui::EF_NONE);
   SelfUnregisteringAcceleratorTarget target(return_accelerator, focus_manager);
   EXPECT_EQ(target.accelerator_count(), 0);
-  EXPECT_EQ(NULL,
-            focus_manager->GetCurrentTargetForAccelerator(return_accelerator));
+  EXPECT_EQ(NULL, focus_manager->GetTargetForAccelerator(return_accelerator));
 
   // Register the target.
   focus_manager->RegisterAccelerator(return_accelerator,
                                      ui::AcceleratorManager::kNormalPriority,
                                      &target);
   EXPECT_EQ(&target,
-            focus_manager->GetCurrentTargetForAccelerator(return_accelerator));
+            focus_manager->GetTargetForAccelerator(return_accelerator));
 
   // Hitting the return key. The target will be unregistered.
   EXPECT_TRUE(focus_manager->ProcessAccelerator(return_accelerator));
   EXPECT_EQ(target.accelerator_count(), 1);
-  EXPECT_EQ(NULL,
-            focus_manager->GetCurrentTargetForAccelerator(return_accelerator));
+  EXPECT_EQ(NULL, focus_manager->GetTargetForAccelerator(return_accelerator));
 
   // Hitting the return key again; nothing should happen.
   EXPECT_FALSE(focus_manager->ProcessAccelerator(return_accelerator));
   EXPECT_EQ(target.accelerator_count(), 1);
 }
 
 class FocusManagerDtorTest : public FocusManagerTest {
  protected:
   typedef std::vector<std::string> DtorTrackVector;
 
   class FocusManagerDtorTracked : public FocusManager {
    public:
     FocusManagerDtorTracked(Widget* widget, DtorTrackVector* dtor_tracker)
-      : FocusManager(widget, NULL /* delegate */),
-        dtor_tracker_(dtor_tracker) {
-    }
+        : FocusManager(widget), dtor_tracker_(dtor_tracker) {}
 
     ~FocusManagerDtorTracked() override {
       dtor_tracker_->push_back("FocusManagerDtorTracked");
     }
 
     DtorTrackVector* dtor_tracker_;
 
    private:
     DISALLOW_COPY_AND_ASSIGN(FocusManagerDtorTracked);
   };
@@ skipping 417 matching lines @@
   EXPECT_EQ(view1, GetFocusManager()->GetFocusedView());
 
   // Allow focus to go to the parent, and focus backwards which should now move
   // up |widget_view| (in the parent).
   delegate->set_should_advance_focus_to_parent(true);
   GetFocusManager()->AdvanceFocus(true);
   EXPECT_EQ(widget_view, GetFocusManager()->GetFocusedView());
 }
 
 }  // namespace views