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/app_menu_button.h" | 5 #include "chrome/browser/ui/views/toolbar/app_menu_button.h" |
6 | 6 |
7 #include "base/location.h" | 7 #include "base/location.h" |
8 #include "base/metrics/histogram_macros.h" | 8 #include "base/metrics/histogram_macros.h" |
9 #include "base/single_thread_task_runner.h" | 9 #include "base/single_thread_task_runner.h" |
10 #include "base/threading/thread_task_runner_handle.h" | 10 #include "base/threading/thread_task_runner_handle.h" |
(...skipping 26 matching lines...) Expand all Loading... |
37 AppMenuButton::AppMenuButton(ToolbarView* toolbar_view) | 37 AppMenuButton::AppMenuButton(ToolbarView* toolbar_view) |
38 : views::MenuButton(base::string16(), toolbar_view, false), | 38 : views::MenuButton(base::string16(), toolbar_view, false), |
39 severity_(AppMenuIconPainter::SEVERITY_NONE), | 39 severity_(AppMenuIconPainter::SEVERITY_NONE), |
40 type_(AppMenuIconController::IconType::NONE), | 40 type_(AppMenuIconController::IconType::NONE), |
41 toolbar_view_(toolbar_view), | 41 toolbar_view_(toolbar_view), |
42 allow_extension_dragging_( | 42 allow_extension_dragging_( |
43 extensions::FeatureSwitch::extension_action_redesign()->IsEnabled()), | 43 extensions::FeatureSwitch::extension_action_redesign()->IsEnabled()), |
44 margin_trailing_(0), | 44 margin_trailing_(0), |
45 weak_factory_(this) { | 45 weak_factory_(this) { |
46 if (ui::MaterialDesignController::IsModeMaterial()) | 46 if (ui::MaterialDesignController::IsModeMaterial()) |
47 SetHasInkDrop(true); | 47 SetHasInkDrop(INK_DROP_WITH_GESTURE_HANDLING); |
48 else | 48 else |
49 icon_painter_.reset(new AppMenuIconPainter(this)); | 49 icon_painter_.reset(new AppMenuIconPainter(this)); |
50 } | 50 } |
51 | 51 |
52 AppMenuButton::~AppMenuButton() {} | 52 AppMenuButton::~AppMenuButton() {} |
53 | 53 |
54 void AppMenuButton::SetSeverity(AppMenuIconController::IconType type, | 54 void AppMenuButton::SetSeverity(AppMenuIconController::IconType type, |
55 AppMenuIconPainter::Severity severity, | 55 AppMenuIconPainter::Severity severity, |
56 bool animate) { | 56 bool animate) { |
57 if (ui::MaterialDesignController::IsModeMaterial()) { | 57 if (ui::MaterialDesignController::IsModeMaterial()) { |
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
266 views::MenuButton::OnPaint(canvas); | 266 views::MenuButton::OnPaint(canvas); |
267 if (ui::MaterialDesignController::IsModeMaterial()) | 267 if (ui::MaterialDesignController::IsModeMaterial()) |
268 return; | 268 return; |
269 // Use GetPreferredSize() to center the icon inside the visible bounds rather | 269 // Use GetPreferredSize() to center the icon inside the visible bounds rather |
270 // than the whole size() (which may refer to hit test region extended to the | 270 // than the whole size() (which may refer to hit test region extended to the |
271 // end of the toolbar in maximized mode). | 271 // end of the toolbar in maximized mode). |
272 icon_painter_->Paint(canvas, GetThemeProvider(), | 272 icon_painter_->Paint(canvas, GetThemeProvider(), |
273 gfx::Rect(GetPreferredSize()), | 273 gfx::Rect(GetPreferredSize()), |
274 AppMenuIconPainter::BEZEL_NONE); | 274 AppMenuIconPainter::BEZEL_NONE); |
275 } | 275 } |
OLD | NEW |