OLD | NEW |
---|---|
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 "chrome/browser/ui/views/omnibox/omnibox_view_views.h" | 5 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "chrome/browser/ui/browser.h" | 8 #include "chrome/browser/ui/browser.h" |
9 #include "chrome/browser/ui/browser_commands.h" | 9 #include "chrome/browser/ui/browser_commands.h" |
10 #include "chrome/browser/ui/browser_window.h" | 10 #include "chrome/browser/ui/browser_window.h" |
11 #include "chrome/browser/ui/omnibox/location_bar.h" | 11 #include "chrome/browser/ui/omnibox/location_bar.h" |
12 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h" | 12 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h" |
13 #include "chrome/browser/ui/view_ids.h" | 13 #include "chrome/browser/ui/view_ids.h" |
14 #include "chrome/browser/ui/views/frame/browser_view.h" | 14 #include "chrome/browser/ui/views/frame/browser_view.h" |
15 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" | 15 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" |
16 #include "chrome/test/base/in_process_browser_test.h" | 16 #include "chrome/test/base/in_process_browser_test.h" |
17 #include "chrome/test/base/interactive_test_utils.h" | 17 #include "chrome/test/base/interactive_test_utils.h" |
18 #include "grit/generated_resources.h" | 18 #include "grit/generated_resources.h" |
19 #include "ui/aura/test/event_generator.h" | 19 #include "ui/aura/test/event_generator.h" |
20 #include "ui/aura/window.h" | 20 #include "ui/aura/window.h" |
21 #include "ui/aura/window_tree_host.h" | 21 #include "ui/aura/window_tree_host.h" |
22 #include "ui/base/clipboard/clipboard.h" | 22 #include "ui/base/clipboard/clipboard.h" |
23 #include "ui/base/clipboard/scoped_clipboard_writer.h" | 23 #include "ui/base/clipboard/scoped_clipboard_writer.h" |
24 #include "ui/base/ime/text_input_focus_manager.h" | |
24 #include "ui/base/test/ui_controls.h" | 25 #include "ui/base/test/ui_controls.h" |
25 #include "ui/base/ui_base_switches.h" | 26 #include "ui/base/ui_base_switches.h" |
26 #include "ui/events/event_processor.h" | 27 #include "ui/events/event_processor.h" |
27 #include "ui/views/controls/textfield/textfield_test_api.h" | 28 #include "ui/views/controls/textfield/textfield_test_api.h" |
28 | 29 |
29 class OmniboxViewViewsTest : public InProcessBrowserTest { | 30 class OmniboxViewViewsTest : public InProcessBrowserTest { |
30 protected: | 31 protected: |
31 OmniboxViewViewsTest() {} | 32 OmniboxViewViewsTest() {} |
32 | 33 |
33 static void GetOmniboxViewForBrowser(const Browser* browser, | 34 static void GetOmniboxViewForBrowser(const Browser* browser, |
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
317 omnibox_view_views->GetBoundsInScreen().CenterPoint(); | 318 omnibox_view_views->GetBoundsInScreen().CenterPoint(); |
318 Tap(omnibox_center, omnibox_center); | 319 Tap(omnibox_center, omnibox_center); |
319 EXPECT_TRUE(textfield_test_api.touch_selection_controller()); | 320 EXPECT_TRUE(textfield_test_api.touch_selection_controller()); |
320 | 321 |
321 // Execute a command and check if it deactivate touch editing. Paste & Go is | 322 // Execute a command and check if it deactivate touch editing. Paste & Go is |
322 // chosen since it is specific to Omnibox and its execution wouldn't be | 323 // chosen since it is specific to Omnibox and its execution wouldn't be |
323 // delgated to the base Textfield class. | 324 // delgated to the base Textfield class. |
324 omnibox_view_views->ExecuteCommand(IDS_PASTE_AND_GO, ui::EF_NONE); | 325 omnibox_view_views->ExecuteCommand(IDS_PASTE_AND_GO, ui::EF_NONE); |
325 EXPECT_FALSE(textfield_test_api.touch_selection_controller()); | 326 EXPECT_FALSE(textfield_test_api.touch_selection_controller()); |
326 } | 327 } |
328 | |
329 IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest, FocusedTextInputClient) { | |
330 base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); | |
331 cmd_line->AppendSwitch(switches::kEnableTextInputFocusManager); | |
332 | |
333 chrome::FocusLocationBar(browser()); | |
sky
2014/05/30 16:30:15
This is done in SetUp, so it shouldn't be necessar
Yuki
2014/06/02 07:38:55
This is done in SetUpOnMainThread without kEnableT
| |
334 OmniboxView* view = NULL; | |
335 ASSERT_NO_FATAL_FAILURE(GetOmniboxViewForBrowser(browser(), &view)); | |
336 OmniboxViewViews* omnibox_view_views = static_cast<OmniboxViewViews*>(view); | |
337 ui::TextInputFocusManager* text_input_focus_manager = | |
338 ui::TextInputFocusManager::GetInstance(); | |
339 EXPECT_EQ(omnibox_view_views->GetTextInputClient(), | |
340 text_input_focus_manager->GetFocusedTextInputClient()); | |
341 } | |
OLD | NEW |