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

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

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on 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/gfx/font_render_params_linux_unittest.cc ('k') | ui/gfx/geometry/r_tree_base.h » ('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/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/memory/singleton.h" 8 #include "base/memory/singleton.h"
9 #include "ui/gfx/win/singleton_hwnd.h" 9 #include "ui/gfx/win/singleton_hwnd.h"
10 10
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 52
53 CachedFontRenderParams() {} 53 CachedFontRenderParams() {}
54 virtual ~CachedFontRenderParams() { 54 virtual ~CachedFontRenderParams() {
55 // Can't remove the SingletonHwnd observer here since SingletonHwnd may have 55 // Can't remove the SingletonHwnd observer here since SingletonHwnd may have
56 // been destroyed already (both singletons). 56 // been destroyed already (both singletons).
57 } 57 }
58 58
59 virtual void OnWndProc(HWND hwnd, 59 virtual void OnWndProc(HWND hwnd,
60 UINT message, 60 UINT message,
61 WPARAM wparam, 61 WPARAM wparam,
62 LPARAM lparam) OVERRIDE { 62 LPARAM lparam) override {
63 if (message == WM_SETTINGCHANGE) { 63 if (message == WM_SETTINGCHANGE) {
64 params_.reset(); 64 params_.reset();
65 gfx::SingletonHwnd::GetInstance()->RemoveObserver(this); 65 gfx::SingletonHwnd::GetInstance()->RemoveObserver(this);
66 } 66 }
67 } 67 }
68 68
69 scoped_ptr<FontRenderParams> params_; 69 scoped_ptr<FontRenderParams> params_;
70 70
71 DISALLOW_COPY_AND_ASSIGN(CachedFontRenderParams); 71 DISALLOW_COPY_AND_ASSIGN(CachedFontRenderParams);
72 }; 72 };
73 73
74 } // namespace 74 } // namespace
75 75
76 FontRenderParams GetFontRenderParams(const FontRenderParamsQuery& query, 76 FontRenderParams GetFontRenderParams(const FontRenderParamsQuery& query,
77 std::string* family_out) { 77 std::string* family_out) {
78 // Customized font rendering settings are not supported, only defaults. 78 // Customized font rendering settings are not supported, only defaults.
79 if (!query.is_empty() || family_out) 79 if (!query.is_empty() || family_out)
80 NOTIMPLEMENTED(); 80 NOTIMPLEMENTED();
81 return CachedFontRenderParams::GetInstance()->GetParams( 81 return CachedFontRenderParams::GetInstance()->GetParams(
82 query.for_web_contents); 82 query.for_web_contents);
83 } 83 }
84 84
85 } // namespace gfx 85 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gfx/font_render_params_linux_unittest.cc ('k') | ui/gfx/geometry/r_tree_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698