Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5)

Side by Side Diff: views/window/window.cc

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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 | Annotate | Revision Log
« no previous file with comments | « views/window/window.h ('k') | views/window/window_gtk.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "base/string_util.h" 7 #include "base/string_util.h"
8 #include "gfx/font.h"
9 #include "gfx/size.h"
10 #include "ui/base/l10n/l10n_font_util.h" 8 #include "ui/base/l10n/l10n_font_util.h"
11 #include "ui/base/resource/resource_bundle.h" 9 #include "ui/base/resource/resource_bundle.h"
10 #include "ui/gfx/font.h"
11 #include "ui/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 ui::GetLocalizedContentsWidthForFont(col_resource_id, 18 return ui::GetLocalizedContentsWidthForFont(col_resource_id,
19 ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::BaseFont)); 19 ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::BaseFont));
20 } 20 }
21 21
(...skipping 21 matching lines...) Expand all
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
OLDNEW
« no previous file with comments | « views/window/window.h ('k') | views/window/window_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698