Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3311)

Unified Diff: chrome/browser/ui/views/find_bar_controller_interactive_uitest.cc

Issue 838253004: MacViews: Fix duplicate definition of ExtensionKeyBindingRegistry::SetShortcutHandlingSuspended (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@DragBookmarks2
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/find_bar_controller_interactive_uitest.cc
diff --git a/chrome/browser/ui/views/find_bar_controller_interactive_uitest.cc b/chrome/browser/ui/views/find_bar_controller_interactive_uitest.cc
index bc57b79716c9dbf37737aae1375a95d3cab297a8..4bb377e9df10b05e9db10584e1fa9130ffe16e5b 100644
--- a/chrome/browser/ui/views/find_bar_controller_interactive_uitest.cc
+++ b/chrome/browser/ui/views/find_bar_controller_interactive_uitest.cc
@@ -44,14 +44,14 @@ IN_PROC_BROWSER_TEST_F(FindBarControllerTest, AcceleratorRestoring) {
// See where Escape is registered.
ui::Accelerator escape(ui::VKEY_ESCAPE, ui::EF_NONE);
ui::AcceleratorTarget* old_target =
- focus_manager->GetCurrentTargetForAccelerator(escape);
+ focus_manager->GetTargetForAccelerator(escape);
EXPECT_TRUE(old_target != NULL);
chrome::ShowFindBar(browser());
// Our Find bar should be the new target.
ui::AcceleratorTarget* new_target =
- focus_manager->GetCurrentTargetForAccelerator(escape);
+ focus_manager->GetTargetForAccelerator(escape);
EXPECT_TRUE(new_target != NULL);
EXPECT_NE(new_target, old_target);
@@ -62,15 +62,13 @@ IN_PROC_BROWSER_TEST_F(FindBarControllerTest, AcceleratorRestoring) {
FindBarController::kKeepResultsInFindBox);
// The accelerator for Escape should be back to what it was before.
- EXPECT_EQ(old_target,
- focus_manager->GetCurrentTargetForAccelerator(escape));
+ EXPECT_EQ(old_target, focus_manager->GetTargetForAccelerator(escape));
// Show find bar again with animation on, and the target should be on
// find bar.
chrome::DisableFindBarAnimationsDuringTesting(false);
chrome::ShowFindBar(browser());
- EXPECT_EQ(new_target,
- focus_manager->GetCurrentTargetForAccelerator(escape));
+ EXPECT_EQ(new_target, focus_manager->GetTargetForAccelerator(escape));
}
} // namespace

Powered by Google App Engine
This is Rietveld 408576698