views/window/window.cc - Issue 1132006: Move app/gfx/canvas and app/gfx/font to gfx/.

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: views/window/window.cc

Issue 1132006: Move app/gfx/canvas and app/gfx/font to gfx/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 10 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 | Annotate | Revision Log

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

6	6

7 #include "app/gfx/font.h"

8 #include "app/gfx/font_util.h"	7 #include "app/gfx/font_util.h"

9 #include "app/resource_bundle.h"	8 #include "app/resource_bundle.h"

10 #include "base/string_util.h"	9 #include "base/string_util.h"

	10 #include "gfx/font.h"

11 #include "gfx/size.h"	11 #include "gfx/size.h"

12 #include "views/widget/widget.h"	12 #include "views/widget/widget.h"

13	13

14 namespace views {	14 namespace views {

15	15

16 // static	16 // static

17 int Window::GetLocalizedContentsWidth(int col_resource_id) {	17 int Window::GetLocalizedContentsWidth(int col_resource_id) {

18 return gfx::GetLocalizedContentsWidthForFont(col_resource_id,	18 return gfx::GetLocalizedContentsWidthForFont(col_resource_id,

19 ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::BaseFont));	19 ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::BaseFont));

20 }	20 }

(...skipping 22 matching lines...) Expand all Loading...
43 if (!window->IsAppWindow())	43 if (!window->IsAppWindow())

44 window->Close();	44 window->Close();

45 } else {	45 } else {

46 // If it's not a Window, then close it anyway since it probably is	46 // If it's not a Window, then close it anyway since it probably is

47 // secondary.	47 // secondary.

48 widget->Close();	48 widget->Close();

49 }	49 }

50 }	50 }

51	51

52 } // namespace views	52 } // namespace views

OLD	NEW

« no previous file with comments | « views/window/dialog_client_view.cc ('k') | views/window/window_win.cc » ('j') | no next file with comments »