ash/shelf/overflow_button.cc - Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2

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/shelf/overflow_button.cc

Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2 (Closed)

Patch Set: Created 3 years, 9 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/shelf/overflow_button.h ('k') | ash/shelf/shelf_alignment_menu.h » ('j') | no next file with comments »

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

6	6

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

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

9 #include "ash/common/shelf/wm_shelf.h"

10 #include "ash/resources/vector_icons/vector_icons.h"	7 #include "ash/resources/vector_icons/vector_icons.h"

	8 #include "ash/shelf/shelf_constants.h"

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

	10 #include "ash/shelf/wm_shelf.h"

11 #include "ash/strings/grit/ash_strings.h"	11 #include "ash/strings/grit/ash_strings.h"

12 #include "base/memory/ptr_util.h"	12 #include "base/memory/ptr_util.h"

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

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

15 #include "ui/gfx/image/image_skia_operations.h"	15 #include "ui/gfx/image/image_skia_operations.h"

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

17 #include "ui/gfx/skbitmap_operations.h"	17 #include "ui/gfx/skbitmap_operations.h"

18 #include "ui/views/animation/flood_fill_ink_drop_ripple.h"	18 #include "ui/views/animation/flood_fill_ink_drop_ripple.h"

19 #include "ui/views/animation/ink_drop_impl.h"	19 #include "ui/views/animation/ink_drop_impl.h"

20 #include "ui/views/animation/ink_drop_mask.h"	20 #include "ui/views/animation/ink_drop_mask.h"

(...skipping 120 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
141 // a left-aligned shelf, and to the left edge of a right-aligned shelf.	141 // a left-aligned shelf, and to the left edge of a right-aligned shelf.

142 const int inset = (GetShelfConstant(SHELF_SIZE) - kOverflowButtonSize) / 2;	142 const int inset = (GetShelfConstant(SHELF_SIZE) - kOverflowButtonSize) / 2;

143 const int x = alignment == SHELF_ALIGNMENT_LEFT	143 const int x = alignment == SHELF_ALIGNMENT_LEFT

144 ? content_bounds.right() - inset - kOverflowButtonSize	144 ? content_bounds.right() - inset - kOverflowButtonSize

145 : content_bounds.x() + inset;	145 : content_bounds.x() + inset;

146 return gfx::Rect(x, content_bounds.y() + inset, kOverflowButtonSize,	146 return gfx::Rect(x, content_bounds.y() + inset, kOverflowButtonSize,

147 kOverflowButtonSize);	147 kOverflowButtonSize);

148 }	148 }

149	149

150 } // namespace ash	150 } // namespace ash

OLD	NEW