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

Side by Side Diff: ui/gfx/font_render_params_mac.cc

Issue 659233002: STASH: Epic Experimental patch for toolkit-views App List on Mac Base URL: https://chromium.googlesource.com/chromium/src.git/+/master
Patch Set: Fix a few things. Works@master Created 6 years, 2 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
« no previous file with comments | « ui/app_list/views/app_list_view.cc ('k') | ui/gfx/nine_image_painter.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "ui/gfx/font_render_params.h" 5 #include "ui/gfx/font_render_params.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 9
10 namespace gfx { 10 namespace gfx {
(...skipping 11 matching lines...) Expand all
22 params.hinting = FontRenderParams::HINTING_MEDIUM; 22 params.hinting = FontRenderParams::HINTING_MEDIUM;
23 23
24 return params; 24 return params;
25 } 25 }
26 26
27 } // namespace 27 } // namespace
28 28
29 FontRenderParams GetFontRenderParams(const FontRenderParamsQuery& query, 29 FontRenderParams GetFontRenderParams(const FontRenderParamsQuery& query,
30 std::string* family_out) { 30 std::string* family_out) {
31 // TODO: Query the OS for font render settings instead of returning defaults. 31 // TODO: Query the OS for font render settings instead of returning defaults.
32 #if 0
32 if (!query.is_empty() || family_out) 33 if (!query.is_empty() || family_out)
33 NOTIMPLEMENTED(); 34 NOTIMPLEMENTED();
35 #endif
34 CR_DEFINE_STATIC_LOCAL(const gfx::FontRenderParams, params, (LoadDefaults())); 36 CR_DEFINE_STATIC_LOCAL(const gfx::FontRenderParams, params, (LoadDefaults()));
35 return params; 37 return params;
36 } 38 }
37 39
38 } // namespace gfx 40 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/app_list/views/app_list_view.cc ('k') | ui/gfx/nine_image_painter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698