Don't select all when autofocusing the location bar on New Tab creation. Users could already be typing in the omnibox before the load commits (e.g. due to a slow renderer process startup) and this typing would then be selected and overwritten.

BUG=41466
TEST=On a very slow machine, typing before a new tab finishes loading should not be selected or cleared once the tab finishes loading.
Review URL: http://codereview.chromium.org/1738004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45406 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 11 insertions, 12 deletions

diff --git a/chrome/browser/chromeos/frame/browser_view.cc b/chrome/browser/chromeos/frame/browser_view.cc
index 254be1d..bf2dac7 100644
--- a/chrome/browser/chromeos/frame/browser_view.cc
+++ b/chrome/browser/chromeos/frame/browser_view.cc
@@ -84,7 +84,7 @@ class ChromeosTab : public Tab {
   // Overridden from views::View.
   virtual void OnMouseEntered(const views::MouseEvent& event) {
     TabRenderer::OnMouseEntered(event);
-    browser_view_->ShowCompactLocationBarUnderSelectedTab();
+    browser_view_->ShowCompactLocationBarUnderSelectedTab(true);
   }
 
  private:
@@ -255,7 +255,7 @@ class BrowserViewLayout : public ::BrowserViewLayout {
      if (compact_navigation_bar_->IsVisible()) {
      // Update the size and location of the compact location bar.
      int index = browser_view()->browser()->selected_index();
-     compact_location_bar_host_->Update(index, false);
+     compact_location_bar_host_->Update(index, false, true);
      }
     */
 
@@ -412,12 +412,11 @@ bool BrowserView::IsToolbarVisible() const {
   return ::BrowserView::IsToolbarVisible();
 }
 
-void BrowserView::SetFocusToLocationBar() {
-  if (is_compact_style()) {
-    ShowCompactLocationBarUnderSelectedTab();
-  } else {
-    ::BrowserView::SetFocusToLocationBar();
-  }
+void BrowserView::SetFocusToLocationBar(bool select_all) {
+  if (is_compact_style())
+    ShowCompactLocationBarUnderSelectedTab(select_all);
+  else
+    ::BrowserView::SetFocusToLocationBar(select_all);
 }
 
 void BrowserView::ToggleCompactNavigationBar() {
@@ -516,11 +515,11 @@ bool BrowserView::IsButtonVisible(const views::View* button_view) const {
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserView public:
 
-void BrowserView::ShowCompactLocationBarUnderSelectedTab() {
+void BrowserView::ShowCompactLocationBarUnderSelectedTab(bool select_all) {
   if (!is_compact_style())
     return;
   int index = browser()->selected_index();
-  compact_location_bar_host_->Update(index, true);
+  compact_location_bar_host_->Update(index, true, select_all);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/chromeos/frame/browser_view.h b/chrome/browser/chromeos/frame/browser_view.h
index 0d3dd2a..3bdea4f 100644
--- a/chrome/browser/chromeos/frame/browser_view.h
+++ b/chrome/browser/chromeos/frame/browser_view.h
@@ -61,7 +61,7 @@ class BrowserView : public ::BrowserView,
   virtual void Init();
   virtual void Show();
   virtual bool IsToolbarVisible() const;
-  virtual void SetFocusToLocationBar();
+  virtual void SetFocusToLocationBar(bool select_all);
   virtual void ToggleCompactNavigationBar();
   virtual views::LayoutManager* CreateLayoutManager() const;
   virtual BaseTabStrip* CreateTabStrip(TabStripModel* tab_strip_model);
@@ -86,7 +86,7 @@ class BrowserView : public ::BrowserView,
   virtual bool IsButtonVisible(const views::View* button_view) const;
 
   // Shows the compact location bar under the selected tab.
-  void ShowCompactLocationBarUnderSelectedTab();
+  void ShowCompactLocationBarUnderSelectedTab(bool select_all);
 
   // Returns true if the ui style is in Compact mode.
   bool is_compact_style() const {