Modified the toolbar button handler so that the handler can revert its omni...

chrome/browser/views/toolbar_view.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/views/toolbar_view.h"
 
 #include <string>
 
 #include "app/drag_drop_types.h"
 #include "app/gfx/canvas.h"
@@ skipping 333 matching lines @@
       break;
   }
   if (button)
     button->SetEnabled(enabled);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, views::Button::ButtonListener implementation:
 
 void ToolbarView::ButtonPressed(views::Button* sender) {
+  int id = sender->tag();
+  switch (id) {
+    case IDC_BACK:
+    case IDC_FORWARD:
+    case IDC_RELOAD:
+      // Forcibly reset the location bar, since otherwise it won't discard any
+      // ongoing user edits, since it doesn't realize this is a user-initiated
+      // action.
+      location_bar_->Revert();
+      break;
+  }
   browser_->ExecuteCommandWithDisposition(
-      sender->tag(),
-      event_utils::DispositionFromEventFlags(sender->mouse_event_flags()));
+      id, event_utils::DispositionFromEventFlags(sender->mouse_event_flags()));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, AutocompletePopupPositioner implementation:
 
 gfx::Rect ToolbarView::GetPopupBounds() const {
   gfx::Point origin;
   views::View::ConvertPointToScreen(star_, &origin);
   origin.set_y(origin.y() + star_->height() + kOmniboxPopupVerticalSpacing);
   gfx::Rect popup_bounds(origin.x(), origin.y(),
@@ skipping 726 matching lines @@
   app_menu_contents_->AddItem(IDC_ABOUT,
                               l10n_util::GetStringFUTF16(
                                   IDS_ABOUT,
                                   l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
   app_menu_contents_->AddItemWithStringId(IDC_HELP_PAGE, IDS_HELP_PAGE);
   app_menu_contents_->AddSeparator();
   app_menu_contents_->AddItemWithStringId(IDC_EXIT, IDS_EXIT);
 
   app_menu_menu_.reset(new views::Menu2(app_menu_contents_.get()));
 }