Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(497)

Side by Side Diff: ash/shelf/app_list_button.cc

Issue 2033553003: Add MD ink drop ripple to shelf app items (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added tests Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "ash/shelf/app_list_button.h" 5 #include "ash/shelf/app_list_button.h"
6 6
7 #include "ash/ash_constants.h" 7 #include "ash/ash_constants.h"
8 #include "ash/common/material_design/material_design_controller.h" 8 #include "ash/common/material_design/material_design_controller.h"
9 #include "ash/common/shelf/shelf_item_types.h" 9 #include "ash/common/shelf/shelf_item_types.h"
10 #include "ash/shelf/shelf_layout_manager.h" 10 #include "ash/shelf/shelf_layout_manager.h"
11 #include "ash/shelf/shelf_view.h" 11 #include "ash/shelf/shelf_view.h"
12 #include "ash/shelf/shelf_widget.h" 12 #include "ash/shelf/shelf_widget.h"
13 #include "ash/shell.h" 13 #include "ash/shell.h"
14 #include "base/command_line.h" 14 #include "base/command_line.h"
15 #include "grit/ash_resources.h" 15 #include "grit/ash_resources.h"
16 #include "grit/ash_strings.h" 16 #include "grit/ash_strings.h"
17 #include "ui/accessibility/ax_view_state.h" 17 #include "ui/accessibility/ax_view_state.h"
18 #include "ui/app_list/app_list_switches.h" 18 #include "ui/app_list/app_list_switches.h"
19 #include "ui/base/l10n/l10n_util.h" 19 #include "ui/base/l10n/l10n_util.h"
20 #include "ui/base/resource/resource_bundle.h" 20 #include "ui/base/resource/resource_bundle.h"
21 #include "ui/base/ui_base_switches_util.h" 21 #include "ui/base/ui_base_switches_util.h"
22 #include "ui/gfx/canvas.h" 22 #include "ui/gfx/canvas.h"
23 #include "ui/gfx/paint_vector_icon.h" 23 #include "ui/gfx/paint_vector_icon.h"
24 #include "ui/gfx/vector_icons_public.h" 24 #include "ui/gfx/vector_icons_public.h"
25 #include "ui/views/painter.h" 25 #include "ui/views/painter.h"
26 26
27 namespace ash { 27 namespace ash {
28 28
29 AppListButton::AppListButton(ShelfView* shelf_view) 29 AppListButton::AppListButton(ShelfView* shelf_view)
30 : views::ImageButton(shelf_view), 30 : views::ImageButton(nullptr),
31 draw_background_as_active_(false), 31 draw_background_as_active_(false),
32 shelf_view_(shelf_view) { 32 shelf_view_(shelf_view) {
33 SetAccessibleName( 33 SetAccessibleName(
34 app_list::switches::IsExperimentalAppListEnabled() 34 app_list::switches::IsExperimentalAppListEnabled()
35 ? l10n_util::GetStringUTF16(IDS_ASH_SHELF_APP_LIST_LAUNCHER_TITLE) 35 ? l10n_util::GetStringUTF16(IDS_ASH_SHELF_APP_LIST_LAUNCHER_TITLE)
36 : l10n_util::GetStringUTF16(IDS_ASH_SHELF_APP_LIST_TITLE)); 36 : l10n_util::GetStringUTF16(IDS_ASH_SHELF_APP_LIST_TITLE));
37 SetSize(gfx::Size(kShelfSize, kShelfSize)); 37 SetSize(gfx::Size(kShelfSize, kShelfSize));
38 SetFocusPainter(views::Painter::CreateSolidFocusPainter( 38 SetFocusPainter(views::Painter::CreateSolidFocusPainter(
39 kFocusBorderColor, gfx::Insets(1, 1, 1, 1))); 39 kFocusBorderColor, gfx::Insets(1, 1, 1, 1)));
40 set_notify_action(CustomButton::NOTIFY_ON_PRESS); 40 set_notify_action(CustomButton::NOTIFY_ON_PRESS);
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 foreground_bounds.y()); 158 foreground_bounds.y());
159 159
160 views::Painter::PaintFocusPainter(this, canvas, focus_painter()); 160 views::Painter::PaintFocusPainter(this, canvas, focus_painter());
161 } 161 }
162 162
163 void AppListButton::GetAccessibleState(ui::AXViewState* state) { 163 void AppListButton::GetAccessibleState(ui::AXViewState* state) {
164 state->role = ui::AX_ROLE_BUTTON; 164 state->role = ui::AX_ROLE_BUTTON;
165 state->name = shelf_view_->GetTitleForView(this); 165 state->name = shelf_view_->GetTitleForView(this);
166 } 166 }
167 167
168 void AppListButton::NotifyClick(const ui::Event& event) {
169 ImageButton::NotifyClick(event);
170 shelf_view_->ButtonPressed(this, event, ink_drop());
171 }
172
168 void AppListButton::SetDrawBackgroundAsActive( 173 void AppListButton::SetDrawBackgroundAsActive(
169 bool draw_background_as_active) { 174 bool draw_background_as_active) {
170 if (draw_background_as_active_ == draw_background_as_active) 175 if (draw_background_as_active_ == draw_background_as_active)
171 return; 176 return;
172 draw_background_as_active_ = draw_background_as_active; 177 draw_background_as_active_ = draw_background_as_active;
173 SchedulePaint(); 178 SchedulePaint();
174 } 179 }
175 180
176 } // namespace ash 181 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698