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/memory/ptr_util.h" | 10 #include "base/memory/ptr_util.h" |
(...skipping 16 matching lines...) Expand all Loading... |
27 #include "chrome/grit/generated_resources.h" | 27 #include "chrome/grit/generated_resources.h" |
28 #include "chrome/grit/theme_resources.h" | 28 #include "chrome/grit/theme_resources.h" |
29 #include "extensions/common/feature_switch.h" | 29 #include "extensions/common/feature_switch.h" |
30 #include "third_party/skia/include/core/SkColor.h" | 30 #include "third_party/skia/include/core/SkColor.h" |
31 #include "ui/accessibility/ax_node_data.h" | 31 #include "ui/accessibility/ax_node_data.h" |
32 #include "ui/base/l10n/l10n_util.h" | 32 #include "ui/base/l10n/l10n_util.h" |
33 #include "ui/base/nine_image_painter_factory.h" | 33 #include "ui/base/nine_image_painter_factory.h" |
34 #include "ui/base/resource/resource_bundle.h" | 34 #include "ui/base/resource/resource_bundle.h" |
35 #include "ui/gfx/canvas.h" | 35 #include "ui/gfx/canvas.h" |
36 #include "ui/gfx/geometry/rect.h" | 36 #include "ui/gfx/geometry/rect.h" |
37 #include "ui/resources/grit/ui_resources.h" | |
38 #include "ui/views/bubble/bubble_dialog_delegate.h" | 37 #include "ui/views/bubble/bubble_dialog_delegate.h" |
39 #include "ui/views/controls/resize_area.h" | 38 #include "ui/views/controls/resize_area.h" |
40 #include "ui/views/painter.h" | 39 #include "ui/views/painter.h" |
41 #include "ui/views/widget/widget.h" | 40 #include "ui/views/widget/widget.h" |
42 | 41 |
43 namespace { | 42 namespace { |
44 | 43 |
45 // Returns the ToolbarView for the given |browser|. | 44 // Returns the ToolbarView for the given |browser|. |
46 ToolbarView* GetToolbarView(Browser* browser) { | 45 ToolbarView* GetToolbarView(Browser* browser) { |
47 return BrowserView::GetBrowserViewForBrowser(browser)->toolbar(); | 46 return BrowserView::GetBrowserViewForBrowser(browser)->toolbar(); |
(...skipping 609 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
657 } | 656 } |
658 } | 657 } |
659 | 658 |
660 void BrowserActionsContainer::ClearActiveBubble(views::Widget* widget) { | 659 void BrowserActionsContainer::ClearActiveBubble(views::Widget* widget) { |
661 DCHECK(active_bubble_); | 660 DCHECK(active_bubble_); |
662 DCHECK_EQ(active_bubble_->GetWidget(), widget); | 661 DCHECK_EQ(active_bubble_->GetWidget(), widget); |
663 widget->RemoveObserver(this); | 662 widget->RemoveObserver(this); |
664 active_bubble_ = nullptr; | 663 active_bubble_ = nullptr; |
665 toolbar_actions_bar_->OnBubbleClosed(); | 664 toolbar_actions_bar_->OnBubbleClosed(); |
666 } | 665 } |
OLD | NEW |