| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/views/toolbar/toolbar_button.h" | 5 #include "chrome/browser/ui/views/toolbar/toolbar_button.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" | 8 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" |
| 9 #include "grit/theme_resources.h" | |
| 10 #include "ui/accessibility/ax_view_state.h" | 9 #include "ui/accessibility/ax_view_state.h" |
| 11 #include "ui/base/l10n/l10n_util.h" | 10 #include "ui/base/l10n/l10n_util.h" |
| 12 #include "ui/base/models/menu_model.h" | 11 #include "ui/base/models/menu_model.h" |
| 13 #include "ui/base/theme_provider.h" | 12 #include "ui/base/theme_provider.h" |
| 14 #include "ui/gfx/display.h" | 13 #include "ui/gfx/display.h" |
| 15 #include "ui/gfx/screen.h" | 14 #include "ui/gfx/screen.h" |
| 16 #include "ui/strings/grit/ui_strings.h" | 15 #include "ui/strings/grit/ui_strings.h" |
| 17 #include "ui/views/controls/button/label_button_border.h" | 16 #include "ui/views/controls/button/label_button_border.h" |
| 18 #include "ui/views/controls/menu/menu_item_view.h" | 17 #include "ui/views/controls/menu/menu_item_view.h" |
| 19 #include "ui/views/controls/menu/menu_model_adapter.h" | 18 #include "ui/views/controls/menu/menu_model_adapter.h" |
| (...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 242 | 241 |
| 243 // Need to explicitly clear mouse handler so that events get sent | 242 // Need to explicitly clear mouse handler so that events get sent |
| 244 // properly after the menu finishes running. If we don't do this, then | 243 // properly after the menu finishes running. If we don't do this, then |
| 245 // the first click to other parts of the UI is eaten. | 244 // the first click to other parts of the UI is eaten. |
| 246 SetMouseHandler(NULL); | 245 SetMouseHandler(NULL); |
| 247 | 246 |
| 248 // Set the state back to normal after the drop down menu is closed. | 247 // Set the state back to normal after the drop down menu is closed. |
| 249 if (state_ != STATE_DISABLED) | 248 if (state_ != STATE_DISABLED) |
| 250 SetState(STATE_NORMAL); | 249 SetState(STATE_NORMAL); |
| 251 } | 250 } |
| OLD | NEW |