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 20 matching lines...) Expand all Loading... |
31 #include "ui/accessibility/ax_view_state.h" | 31 #include "ui/accessibility/ax_view_state.h" |
32 #include "ui/base/dragdrop/drag_utils.h" | 32 #include "ui/base/dragdrop/drag_utils.h" |
33 #include "ui/base/l10n/l10n_util.h" | 33 #include "ui/base/l10n/l10n_util.h" |
34 #include "ui/base/material_design/material_design_controller.h" | 34 #include "ui/base/material_design/material_design_controller.h" |
35 #include "ui/base/nine_image_painter_factory.h" | 35 #include "ui/base/nine_image_painter_factory.h" |
36 #include "ui/base/resource/resource_bundle.h" | 36 #include "ui/base/resource/resource_bundle.h" |
37 #include "ui/base/theme_provider.h" | 37 #include "ui/base/theme_provider.h" |
38 #include "ui/gfx/canvas.h" | 38 #include "ui/gfx/canvas.h" |
39 #include "ui/gfx/geometry/rect.h" | 39 #include "ui/gfx/geometry/rect.h" |
40 #include "ui/resources/grit/ui_resources.h" | 40 #include "ui/resources/grit/ui_resources.h" |
41 #include "ui/views/bubble/bubble_delegate.h" | 41 #include "ui/views/bubble/bubble_dialog_delegate.h" |
42 #include "ui/views/controls/resize_area.h" | 42 #include "ui/views/controls/resize_area.h" |
43 #include "ui/views/painter.h" | 43 #include "ui/views/painter.h" |
44 #include "ui/views/widget/widget.h" | 44 #include "ui/views/widget/widget.h" |
45 | 45 |
46 namespace { | 46 namespace { |
47 | 47 |
48 // Horizontal spacing before the chevron (if visible). | 48 // Horizontal spacing before the chevron (if visible). |
49 // TODO(tdanderson): In material design, the chevron should have the same size | 49 // TODO(tdanderson): In material design, the chevron should have the same size |
50 // and vertical spacing as the other action buttons. | 50 // and vertical spacing as the other action buttons. |
51 int GetChevronSpacing() { | 51 int GetChevronSpacing() { |
(...skipping 696 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
748 views::Painter::CreateImageGridPainter(kWarningImages)); | 748 views::Painter::CreateImageGridPainter(kWarningImages)); |
749 } | 749 } |
750 | 750 |
751 void BrowserActionsContainer::ClearActiveBubble(views::Widget* widget) { | 751 void BrowserActionsContainer::ClearActiveBubble(views::Widget* widget) { |
752 DCHECK(active_bubble_); | 752 DCHECK(active_bubble_); |
753 DCHECK_EQ(active_bubble_->GetWidget(), widget); | 753 DCHECK_EQ(active_bubble_->GetWidget(), widget); |
754 widget->RemoveObserver(this); | 754 widget->RemoveObserver(this); |
755 active_bubble_ = nullptr; | 755 active_bubble_ = nullptr; |
756 toolbar_actions_bar_->OnBubbleClosed(); | 756 toolbar_actions_bar_->OnBubbleClosed(); |
757 } | 757 } |
OLD | NEW |