Commit cece544a authored by sky@chromium.org's avatar sky@chromium.org

Fixes regression that was causing omnibox to select all when page finished

loading. This effectively reverts the change to LocationBar. The change to LocationBarView was problematic because the boolean passed to OmniboxView::SelectAll means something different than the boolean passed to LocationBarView::FocusLocation.

BUG=104201
TEST=see bug
R=alicet@chromium.org,ben@chromium.org


Review URL: http://codereview.chromium.org/8486022

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110352 0039d316-1c4b-4281-b951-d872f2087c98
parent 24d4394e
...@@ -352,7 +352,7 @@ void LocationBarView::OnFocus() { ...@@ -352,7 +352,7 @@ void LocationBarView::OnFocus() {
// Then focus the native location view which implements accessibility for // Then focus the native location view which implements accessibility for
// Windows. // Windows.
FocusLocation(true); location_entry_->SetFocus();
} }
void LocationBarView::SetPreviewEnabledPageAction(ExtensionAction* page_action, void LocationBarView::SetPreviewEnabledPageAction(ExtensionAction* page_action,
...@@ -1123,7 +1123,8 @@ void LocationBarView::AcceptInput() { ...@@ -1123,7 +1123,8 @@ void LocationBarView::AcceptInput() {
void LocationBarView::FocusLocation(bool select_all) { void LocationBarView::FocusLocation(bool select_all) {
location_entry_->SetFocus(); location_entry_->SetFocus();
location_entry_->SelectAll(select_all); if (select_all)
location_entry_->SelectAll(true);
} }
void LocationBarView::FocusSearch() { void LocationBarView::FocusSearch() {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment