| Index: chrome/browser/ui/views/toolbar_view.cc
|
| diff --git a/chrome/browser/ui/views/toolbar_view.cc b/chrome/browser/ui/views/toolbar_view.cc
|
| index c9908f4b9d3cf99504f2e1d038271445b578efa6..6aed9019fadda9b43f58857647659b5f30995612 100644
|
| --- a/chrome/browser/ui/views/toolbar_view.cc
|
| +++ b/chrome/browser/ui/views/toolbar_view.cc
|
| @@ -8,6 +8,7 @@
|
| #include "base/utf_string_conversions.h"
|
| #include "chrome/app/chrome_command_ids.h"
|
| #include "chrome/browser/accessibility/browser_accessibility_state.h"
|
| +#include "chrome/browser/event_disposition.h"
|
| #include "chrome/browser/prefs/pref_service.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/ui/browser.h"
|
| @@ -15,7 +16,6 @@
|
| #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
|
| #include "chrome/browser/ui/view_ids.h"
|
| #include "chrome/browser/ui/views/browser_actions_container.h"
|
| -#include "chrome/browser/ui/views/event_utils.h"
|
| #include "chrome/browser/ui/views/wrench_menu.h"
|
| #include "chrome/browser/upgrade_detector.h"
|
| #include "chrome/common/pref_names.h"
|
| @@ -385,7 +385,7 @@ void ToolbarView::ButtonPressed(views::Button* sender,
|
| const views::Event& event) {
|
| int command = sender->tag();
|
| WindowOpenDisposition disposition =
|
| - event_utils::DispositionFromEventFlags(sender->mouse_event_flags());
|
| + browser::DispositionFromEventFlags(sender->mouse_event_flags());
|
| if ((disposition == CURRENT_TAB) &&
|
| ((command == IDC_BACK) || (command == IDC_FORWARD))) {
|
| // Forcibly reset the location bar, since otherwise it won't discard any
|
|
|