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

Side by Side Diff: chrome/browser/ui/views/omnibox/omnibox_view_views_browsertest.cc

Issue 2606943002: Add a TODO comment to fix OmniboxViewViewsTest.SelectionClipboard. (Closed)
Patch Set: Created 3 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) 185 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
186 EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX)); 186 EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX));
187 EXPECT_FALSE(omnibox_view->IsSelectAll()); 187 EXPECT_FALSE(omnibox_view->IsSelectAll());
188 #else 188 #else
189 EXPECT_FALSE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX)); 189 EXPECT_FALSE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX));
190 EXPECT_FALSE(omnibox_view->IsSelectAll()); 190 EXPECT_FALSE(omnibox_view->IsSelectAll());
191 #endif // OS_LINUX && !OS_CHROMEOS 191 #endif // OS_LINUX && !OS_CHROMEOS
192 } 192 }
193 193
194 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) 194 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
195 // TODO(crbug.com/676746): Fix and re-enable this test.
195 IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest, DISABLED_SelectionClipboard) { 196 IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest, DISABLED_SelectionClipboard) {
196 OmniboxView* omnibox_view = NULL; 197 OmniboxView* omnibox_view = NULL;
197 ASSERT_NO_FATAL_FAILURE(GetOmniboxViewForBrowser(browser(), &omnibox_view)); 198 ASSERT_NO_FATAL_FAILURE(GetOmniboxViewForBrowser(browser(), &omnibox_view));
198 omnibox_view->SetUserText(base::ASCIIToUTF16("http://www.google.com/")); 199 omnibox_view->SetUserText(base::ASCIIToUTF16("http://www.google.com/"));
199 OmniboxViewViews* omnibox_view_views = 200 OmniboxViewViews* omnibox_view_views =
200 static_cast<OmniboxViewViews*>(omnibox_view); 201 static_cast<OmniboxViewViews*>(omnibox_view);
201 ASSERT_TRUE(omnibox_view_views); 202 ASSERT_TRUE(omnibox_view_views);
202 gfx::RenderText* render_text = omnibox_view_views->GetRenderText(); 203 gfx::RenderText* render_text = omnibox_view_views->GetRenderText();
203 204
204 // Take the focus away from the omnibox. 205 // Take the focus away from the omnibox.
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
385 IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest, FocusedTextInputClient) { 386 IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest, FocusedTextInputClient) {
386 chrome::FocusLocationBar(browser()); 387 chrome::FocusLocationBar(browser());
387 OmniboxView* view = NULL; 388 OmniboxView* view = NULL;
388 ASSERT_NO_FATAL_FAILURE(GetOmniboxViewForBrowser(browser(), &view)); 389 ASSERT_NO_FATAL_FAILURE(GetOmniboxViewForBrowser(browser(), &view));
389 OmniboxViewViews* omnibox_view_views = static_cast<OmniboxViewViews*>(view); 390 OmniboxViewViews* omnibox_view_views = static_cast<OmniboxViewViews*>(view);
390 ui::InputMethod* input_method = 391 ui::InputMethod* input_method =
391 omnibox_view_views->GetWidget()->GetInputMethod(); 392 omnibox_view_views->GetWidget()->GetInputMethod();
392 EXPECT_EQ(static_cast<ui::TextInputClient*>(omnibox_view_views), 393 EXPECT_EQ(static_cast<ui::TextInputClient*>(omnibox_view_views),
393 input_method->GetTextInputClient()); 394 input_method->GetTextInputClient());
394 } 395 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698