ash/shelf/overflow_button.h - Issue 2036353002: mash: Move ash/common/wm/shelf to ash/common/shelf

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.h

Issue 2036353002: mash: Move ash/common/wm/shelf to ash/common/shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase again 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

« no previous file with comments | « ash/shelf/overflow_bubble_view.cc ('k') | ash/shelf/overflow_button.cc » ('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 #ifndef ASH_SHELF_OVERFLOW_BUTTON_H_	5 #ifndef ASH_SHELF_OVERFLOW_BUTTON_H_

6 #define ASH_SHELF_OVERFLOW_BUTTON_H_	6 #define ASH_SHELF_OVERFLOW_BUTTON_H_

7	7

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

9 #include "base/compiler_specific.h"	9 #include "base/compiler_specific.h"

10 #include "base/macros.h"	10 #include "base/macros.h"

11 #include "ui/gfx/image/image_skia.h"	11 #include "ui/gfx/image/image_skia.h"

12 #include "ui/views/controls/button/custom_button.h"	12 #include "ui/views/controls/button/custom_button.h"

13	13

14 namespace ash {	14 namespace ash {

15	15

16 class Shelf;	16 class Shelf;

17	17

18 // Shelf overflow chevron button.	18 // Shelf overflow chevron button.

(...skipping 17 matching lines...) Expand all Loading...
36 // Bottom image is owned by the resource bundle.	36 // Bottom image is owned by the resource bundle.

37 const gfx::ImageSkia* bottom_image_;	37 const gfx::ImageSkia* bottom_image_;

38 Shelf* shelf_;	38 Shelf* shelf_;

39	39

40 DISALLOW_COPY_AND_ASSIGN(OverflowButton);	40 DISALLOW_COPY_AND_ASSIGN(OverflowButton);

41 };	41 };

42	42

43 } // namespace ash	43 } // namespace ash

44	44

45 #endif // ASH_SHELF_OVERFLOW_BUTTON_H_	45 #endif // ASH_SHELF_OVERFLOW_BUTTON_H_

OLD	NEW