ash/common/shelf/app_list_button.cc - Issue 2228713003: mash: Convert ShelfView to wm common types, clean up Shelf access

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2228713003: mash: Convert ShelfView to wm common types, clean up Shelf access (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix control reaches end of non-void function warnings Created 4 years, 4 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

« no previous file with comments | « ash/common/shelf/DEPS ('k') | ash/common/shelf/overflow_bubble.cc » ('j') | no next file with comments »

OLD	NEW
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/common/shelf/app_list_button.h"	5 #include "ash/common/shelf/app_list_button.h"

6	6

7 #include "ash/common/ash_constants.h"	7 #include "ash/common/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/ink_drop_button_listener.h"	9 #include "ash/common/shelf/ink_drop_button_listener.h"

10 #include "ash/common/shelf/shelf_constants.h"	10 #include "ash/common/shelf/shelf_constants.h"

11 #include "ash/common/shelf/shelf_item_types.h"	11 #include "ash/common/shelf/shelf_item_types.h"

12 #include "ash/common/shelf/shelf_types.h"	12 #include "ash/common/shelf/shelf_types.h"

	13 #include "ash/common/shelf/shelf_view.h"

13 #include "ash/common/shelf/wm_shelf.h"	14 #include "ash/common/shelf/wm_shelf.h"

14 #include "ash/common/shelf/wm_shelf_util.h"	15 #include "ash/common/shelf/wm_shelf_util.h"

15 #include "ash/common/wm_shell.h"	16 #include "ash/common/wm_shell.h"

16 #include "ash/shelf/shelf_view.h"

17 #include "base/command_line.h"	17 #include "base/command_line.h"

18 #include "grit/ash_resources.h"	18 #include "grit/ash_resources.h"

19 #include "grit/ash_strings.h"	19 #include "grit/ash_strings.h"

20 #include "ui/accessibility/ax_view_state.h"	20 #include "ui/accessibility/ax_view_state.h"

21 #include "ui/app_list/app_list_switches.h"	21 #include "ui/app_list/app_list_switches.h"

22 #include "ui/base/l10n/l10n_util.h"	22 #include "ui/base/l10n/l10n_util.h"

23 #include "ui/base/resource/resource_bundle.h"	23 #include "ui/base/resource/resource_bundle.h"

24 #include "ui/base/ui_base_switches_util.h"	24 #include "ui/base/ui_base_switches_util.h"

25 #include "ui/gfx/canvas.h"	25 #include "ui/gfx/canvas.h"

26 #include "ui/gfx/paint_vector_icon.h"	26 #include "ui/gfx/paint_vector_icon.h"

(...skipping 260 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
287 }	287 }

288	288

289 void AppListButton::SetDrawBackgroundAsActive(bool draw_background_as_active) {	289 void AppListButton::SetDrawBackgroundAsActive(bool draw_background_as_active) {

290 if (draw_background_as_active_ == draw_background_as_active)	290 if (draw_background_as_active_ == draw_background_as_active)

291 return;	291 return;

292 draw_background_as_active_ = draw_background_as_active;	292 draw_background_as_active_ = draw_background_as_active;

293 SchedulePaint();	293 SchedulePaint();

294 }	294 }

295	295

296 } // namespace ash	296 } // namespace ash

OLD	NEW