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/browser_actions_container.h" | 5 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
10 #include "base/stl_util.h" | 10 #include "base/stl_util.h" |
(...skipping 10 matching lines...) Expand all Loading... |
21 #include "chrome/browser/ui/views/extensions/browser_action_drag_data.h" | 21 #include "chrome/browser/ui/views/extensions/browser_action_drag_data.h" |
22 #include "chrome/browser/ui/views/frame/browser_view.h" | 22 #include "chrome/browser/ui/views/frame/browser_view.h" |
23 #include "chrome/browser/ui/views/toolbar/app_menu_button.h" | 23 #include "chrome/browser/ui/views/toolbar/app_menu_button.h" |
24 #include "chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.h" | 24 #include "chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.h" |
25 #include "chrome/browser/ui/views/toolbar/toolbar_view.h" | 25 #include "chrome/browser/ui/views/toolbar/toolbar_view.h" |
26 #include "chrome/common/extensions/command.h" | 26 #include "chrome/common/extensions/command.h" |
27 #include "chrome/grit/generated_resources.h" | 27 #include "chrome/grit/generated_resources.h" |
28 #include "extensions/common/feature_switch.h" | 28 #include "extensions/common/feature_switch.h" |
29 #include "grit/theme_resources.h" | 29 #include "grit/theme_resources.h" |
30 #include "third_party/skia/include/core/SkColor.h" | 30 #include "third_party/skia/include/core/SkColor.h" |
| 31 #include "ui/accessibility/ax_enums.h" |
31 #include "ui/accessibility/ax_view_state.h" | 32 #include "ui/accessibility/ax_view_state.h" |
32 #include "ui/base/dragdrop/drag_utils.h" | 33 #include "ui/base/dragdrop/drag_utils.h" |
33 #include "ui/base/l10n/l10n_util.h" | 34 #include "ui/base/l10n/l10n_util.h" |
34 #include "ui/base/material_design/material_design_controller.h" | 35 #include "ui/base/material_design/material_design_controller.h" |
35 #include "ui/base/nine_image_painter_factory.h" | 36 #include "ui/base/nine_image_painter_factory.h" |
36 #include "ui/base/resource/resource_bundle.h" | 37 #include "ui/base/resource/resource_bundle.h" |
37 #include "ui/gfx/canvas.h" | 38 #include "ui/gfx/canvas.h" |
38 #include "ui/gfx/geometry/rect.h" | 39 #include "ui/gfx/geometry/rect.h" |
39 #include "ui/resources/grit/ui_resources.h" | 40 #include "ui/resources/grit/ui_resources.h" |
40 #include "ui/views/bubble/bubble_dialog_delegate.h" | 41 #include "ui/views/bubble/bubble_dialog_delegate.h" |
(...skipping 623 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
664 } | 665 } |
665 } | 666 } |
666 | 667 |
667 void BrowserActionsContainer::ClearActiveBubble(views::Widget* widget) { | 668 void BrowserActionsContainer::ClearActiveBubble(views::Widget* widget) { |
668 DCHECK(active_bubble_); | 669 DCHECK(active_bubble_); |
669 DCHECK_EQ(active_bubble_->GetWidget(), widget); | 670 DCHECK_EQ(active_bubble_->GetWidget(), widget); |
670 widget->RemoveObserver(this); | 671 widget->RemoveObserver(this); |
671 active_bubble_ = nullptr; | 672 active_bubble_ = nullptr; |
672 toolbar_actions_bar_->OnBubbleClosed(); | 673 toolbar_actions_bar_->OnBubbleClosed(); |
673 } | 674 } |
OLD | NEW |