ash/wm/dialog_frame_view.cc - Issue 10756018: Merge grd files in ui/resources and chrome/app/theme

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/dialog_frame_view.cc

Issue 10756018: Merge grd files in ui/resources and chrome/app/theme (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase, *_standard.rc Created 8 years, 5 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

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

6	6

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

8 #include "ui/base/hit_test.h"	8 #include "ui/base/hit_test.h"

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

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

11 #include "ui/gfx/font.h"	11 #include "ui/gfx/font.h"

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

13 #include "ui/gfx/insets.h"	13 #include "ui/gfx/insets.h"

14 #include "ui/views/background.h"	14 #include "ui/views/background.h"

15 #include "ui/views/border.h"	15 #include "ui/views/border.h"

16 #include "ui/views/controls/button/image_button.h"	16 #include "ui/views/controls/button/image_button.h"

17 #include "ui/views/widget/widget.h"	17 #include "ui/views/widget/widget.h"

(...skipping 168 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
186 GetTitleFont().GetHeight() + GetTitleFont().GetFontSize() -	186 GetTitleFont().GetHeight() + GetTitleFont().GetFontSize() -

187 kDialogTopPaddingNudge,	187 kDialogTopPaddingNudge,

188 -kDialogHPaddingNudge,	188 -kDialogHPaddingNudge,

189 -kDialogBottomPaddingNudge,	189 -kDialogBottomPaddingNudge,

190 -kDialogHPaddingNudge);	190 -kDialogHPaddingNudge);

191 return insets;	191 return insets;

192 }	192 }

193	193

194 } // namespace internal	194 } // namespace internal

195 } // namespace views	195 } // namespace views

OLD	NEW

« no previous file with comments | « ash/system/web_notification/web_notification_tray.cc ('k') | ash/wm/frame_painter.cc » ('j') | no next file with comments »