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

Unified Diff: chrome/browser/ui/omnibox/omnibox_view_browsertest.cc

Issue 1144853003: Mac: Omnibox: Retain the "SelectAll" state after a navigation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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/omnibox/omnibox_view_browsertest.cc
diff --git a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
index 77447704611840c2bad82eb7c8a1c2ec51cb22c6..ea24653afa34c43c952e40ba6b0fcf5070b2a191 100644
--- a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
+++ b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
@@ -1866,3 +1866,35 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest,
omnibox_view->Update();
EXPECT_EQ(url_c, omnibox_view->GetText());
}
+
+// Test that if the Omnibox has focus, and had everything selected before a
+// non-user-initiated update, then it retains the selection after the update.
+IN_PROC_BROWSER_TEST_F(OmniboxViewTest, SelectAllStaysAfterUpdate) {
+ OmniboxView* omnibox_view = nullptr;
+ ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
+ TestToolbarModel* test_toolbar_model = new TestToolbarModel;
+ scoped_ptr<ToolbarModel> toolbar_model(test_toolbar_model);
+ browser()->swap_toolbar_models(&toolbar_model);
+
+ base::string16 url_a(ASCIIToUTF16("http://www.a.com/"));
+ base::string16 url_b(ASCIIToUTF16("http://www.b.com/"));
+ chrome::FocusLocationBar(browser());
+
+ test_toolbar_model->set_text(url_a);
+ omnibox_view->Update();
+ EXPECT_EQ(url_a, omnibox_view->GetText());
+ EXPECT_TRUE(omnibox_view->IsSelectAll());
+
+ // Updating while selected should retain SelectAll().
+ test_toolbar_model->set_text(url_b);
+ omnibox_view->Update();
+ EXPECT_EQ(url_b, omnibox_view->GetText());
+ EXPECT_TRUE(omnibox_view->IsSelectAll());
+
+ // Select nothing, then switch back. Shouldn't gain a selection.
+ ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_RIGHT, 0));
+ test_toolbar_model->set_text(url_a);
+ omnibox_view->Update();
+ EXPECT_EQ(url_a, omnibox_view->GetText());
+ EXPECT_FALSE(omnibox_view->IsSelectAll());
+}

Powered by Google App Engine
This is Rietveld 408576698