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

Side by Side Diff: chrome/browser/ui/find_bar/find_bar_host_browsertest.cc

Issue 6246001: Move app/key* to ui/base/keycodes/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "app/keyboard_codes.h"
6 #include "base/message_loop.h" 5 #include "base/message_loop.h"
7 #include "base/string_util.h" 6 #include "base/string_util.h"
8 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
9 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/renderer_host/render_view_host.h" 9 #include "chrome/browser/renderer_host/render_view_host.h"
11 #include "chrome/browser/tab_contents/tab_contents.h" 10 #include "chrome/browser/tab_contents/tab_contents.h"
12 #include "chrome/browser/tab_contents/tab_contents_view.h" 11 #include "chrome/browser/tab_contents/tab_contents_view.h"
13 #include "chrome/browser/tabs/tab_strip_model.h" 12 #include "chrome/browser/tabs/tab_strip_model.h"
14 #include "chrome/browser/ui/browser.h" 13 #include "chrome/browser/ui/browser.h"
15 #include "chrome/browser/ui/browser_navigator.h" 14 #include "chrome/browser/ui/browser_navigator.h"
16 #include "chrome/browser/ui/browser_window.h" 15 #include "chrome/browser/ui/browser_window.h"
17 #include "chrome/browser/ui/find_bar/find_bar.h" 16 #include "chrome/browser/ui/find_bar/find_bar.h"
18 #include "chrome/browser/ui/find_bar/find_bar_controller.h" 17 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
19 #include "chrome/browser/ui/find_bar/find_notification_details.h" 18 #include "chrome/browser/ui/find_bar/find_notification_details.h"
20 #include "chrome/test/in_process_browser_test.h" 19 #include "chrome/test/in_process_browser_test.h"
21 #include "chrome/test/ui_test_utils.h" 20 #include "chrome/test/ui_test_utils.h"
22 #include "net/test/test_server.h" 21 #include "net/test/test_server.h"
22 #include "ui/base/keycodes/keyboard_codes.h"
23 23
24 #if defined(TOOLKIT_VIEWS) 24 #if defined(TOOLKIT_VIEWS)
25 #include "chrome/browser/ui/views/find_bar_host.h" 25 #include "chrome/browser/ui/views/find_bar_host.h"
26 #include "views/focus/focus_manager.h" 26 #include "views/focus/focus_manager.h"
27 #elif defined(TOOLKIT_GTK) 27 #elif defined(TOOLKIT_GTK)
28 #include "chrome/browser/gtk/slide_animator_gtk.h" 28 #include "chrome/browser/gtk/slide_animator_gtk.h"
29 #elif defined(OS_MACOSX) 29 #elif defined(OS_MACOSX)
30 #include "chrome/browser/ui/cocoa/find_bar_bridge.h" 30 #include "chrome/browser/ui/cocoa/find_bar_bridge.h"
31 #endif 31 #endif
32 32
(...skipping 699 matching lines...) Expand 10 before | Expand all | Expand 10 after
732 732
733 // First we navigate to any page. 733 // First we navigate to any page.
734 GURL url = test_server()->GetURL(kSimplePage); 734 GURL url = test_server()->GetURL(kSimplePage);
735 ui_test_utils::NavigateToURL(browser(), url); 735 ui_test_utils::NavigateToURL(browser(), url);
736 736
737 views::FocusManager* focus_manager = 737 views::FocusManager* focus_manager =
738 views::FocusManager::GetFocusManagerForNativeWindow( 738 views::FocusManager::GetFocusManagerForNativeWindow(
739 browser()->window()->GetNativeHandle()); 739 browser()->window()->GetNativeHandle());
740 740
741 // See where Escape is registered. 741 // See where Escape is registered.
742 views::Accelerator escape(app::VKEY_ESCAPE, false, false, false); 742 views::Accelerator escape(ui::VKEY_ESCAPE, false, false, false);
743 views::AcceleratorTarget* old_target = 743 views::AcceleratorTarget* old_target =
744 focus_manager->GetCurrentTargetForAccelerator(escape); 744 focus_manager->GetCurrentTargetForAccelerator(escape);
745 EXPECT_TRUE(old_target != NULL); 745 EXPECT_TRUE(old_target != NULL);
746 746
747 browser()->ShowFindBar(); 747 browser()->ShowFindBar();
748 748
749 // Our Find bar should be the new target. 749 // Our Find bar should be the new target.
750 views::AcceleratorTarget* new_target = 750 views::AcceleratorTarget* new_target =
751 focus_manager->GetCurrentTargetForAccelerator(escape); 751 focus_manager->GetCurrentTargetForAccelerator(escape);
752 752
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
1075 1075
1076 TabContents* tab = browser()->GetSelectedTabContents(); 1076 TabContents* tab = browser()->GetSelectedTabContents();
1077 int ordinal = 0; 1077 int ordinal = 0;
1078 FindInPageWchar(tab, L"link", kFwd, kIgnoreCase, &ordinal); 1078 FindInPageWchar(tab, L"link", kFwd, kIgnoreCase, &ordinal);
1079 EXPECT_EQ(ordinal, 1); 1079 EXPECT_EQ(ordinal, 1);
1080 1080
1081 // End the find session, click on the link. 1081 // End the find session, click on the link.
1082 tab->StopFinding(FindBarController::kActivateSelection); 1082 tab->StopFinding(FindBarController::kActivateSelection);
1083 EXPECT_TRUE(ui_test_utils::WaitForNavigationInCurrentTab(browser())); 1083 EXPECT_TRUE(ui_test_utils::WaitForNavigationInCurrentTab(browser()));
1084 } 1084 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/html_dialog_window_controller.mm ('k') | chrome/browser/ui/views/accelerator_table_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698