ash/launcher/overflow_button.cc - Issue 12313118: Refactor: Shelf Widget

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

Issue 12313118: Refactor: Shelf Widget (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: formatting and moved a couple unit tests Created 7 years, 10 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

« ash/launcher/launcher_tooltip_manager.cc ('K') | « ash/launcher/overflow_button.h ('k') | ash/root_window_controller.h » ('j') | ash/root_window_controller.cc » ('J')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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/launcher/overflow_button.h"	5 #include "ash/launcher/overflow_button.h"

6	6

7 #include "ash/wm/shelf_layout_manager.h"	7 #include "ash/shelf/shelf_layout_manager.h"

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

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

10 #include "third_party/skia/include/core/SkPaint.h"	10 #include "third_party/skia/include/core/SkPaint.h"

11 #include "third_party/skia/include/core/SkPath.h"	11 #include "third_party/skia/include/core/SkPath.h"

12 #include "ui/base/animation/throb_animation.h"	12 #include "ui/base/animation/throb_animation.h"

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

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

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

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

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

(...skipping 127 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
145 } else {	145 } else {

146 canvas->DrawImageInt(*image_,	146 canvas->DrawImageInt(*image_,

147 kButtonHoverSize - image_->width(),	147 kButtonHoverSize - image_->width(),

148 rect.y() + (rect.height() - image_->height()) / 2);	148 rect.y() + (rect.height() - image_->height()) / 2);

149 }	149 }

150 canvas->Restore();	150 canvas->Restore();

151 }	151 }

152	152

153 } // namespace internal	153 } // namespace internal

154 } // namespace ash	154 } // namespace ash

OLD	NEW