ash/wm/panel_frame_view.cc - Issue 10905242: add ash_resources.grd and necessary changes to use images in ash/resources

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/wm/panel_frame_view.cc

Issue 10905242: add ash_resources.grd and necessary changes to use images in ash/resources (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: don't guard ash_strings with aura=1 Created 8 years, 3 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 | Annotate | Revision Log

« no previous file with comments | « ash/wm/maximize_bubble_controller.cc ('k') | ash/wm/resize_shadow.cc » ('j') | no next file with comments »

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/wm/frame_painter.h"	5 #include "ash/wm/frame_painter.h"

6 #include "ash/wm/panel_frame_view.h"	6 #include "ash/wm/panel_frame_view.h"

7 #include "grit/ui_resources.h"	7 #include "grit/ash_resources.h"

8 #include "grit/ui_strings.h" // Accessibility names	8 #include "grit/ui_strings.h" // Accessibility names

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

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

11 #include "ui/base/cursor/cursor.h"	11 #include "ui/base/cursor/cursor.h"

12 #include "ui/base/hit_test.h"	12 #include "ui/base/hit_test.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/font.h"	16 #include "ui/gfx/font.h"

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

(...skipping 68 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
86 close_button_->bounds().bottom(), client_bounds);	86 close_button_->bounds().bottom(), client_bounds);

87 }	87 }

88	88

89 void PanelFrameView::ButtonPressed(views::Button* sender,	89 void PanelFrameView::ButtonPressed(views::Button* sender,

90 const ui::Event& event) {	90 const ui::Event& event) {

91 if (sender == close_button_)	91 if (sender == close_button_)

92 GetWidget()->Close();	92 GetWidget()->Close();

93 }	93 }

94	94

95 } // namespace ash	95 } // namespace ash

OLD	NEW