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

Side by Side Diff: ui/views/widget/native_widget_aura.cc

Issue 1406403007: Eliminate HICON leaks caused by creating icons from bitmap image. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years 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/views/controls/menu/menu_config_win.cc ('k') | ui/views/win/hwnd_message_handler.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 (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 "ui/views/widget/native_widget_aura.h" 5 #include "ui/views/widget/native_widget_aura.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "third_party/skia/include/core/SkRegion.h" 9 #include "third_party/skia/include/core/SkRegion.h"
10 #include "ui/aura/client/aura_constants.h" 10 #include "ui/aura/client/aura_constants.h"
(...skipping 1149 matching lines...) Expand 10 before | Expand all | Expand 10 after
1160 return aura::Env::GetInstance()->IsMouseButtonDown(); 1160 return aura::Env::GetInstance()->IsMouseButtonDown();
1161 } 1161 }
1162 1162
1163 // static 1163 // static
1164 gfx::FontList NativeWidgetPrivate::GetWindowTitleFontList() { 1164 gfx::FontList NativeWidgetPrivate::GetWindowTitleFontList() {
1165 #if defined(OS_WIN) 1165 #if defined(OS_WIN)
1166 NONCLIENTMETRICS_XP ncm; 1166 NONCLIENTMETRICS_XP ncm;
1167 base::win::GetNonClientMetrics(&ncm); 1167 base::win::GetNonClientMetrics(&ncm);
1168 l10n_util::AdjustUIFont(&(ncm.lfCaptionFont)); 1168 l10n_util::AdjustUIFont(&(ncm.lfCaptionFont));
1169 base::win::ScopedHFONT caption_font(CreateFontIndirect(&(ncm.lfCaptionFont))); 1169 base::win::ScopedHFONT caption_font(CreateFontIndirect(&(ncm.lfCaptionFont)));
1170 return gfx::FontList(gfx::Font(caption_font)); 1170 return gfx::FontList(gfx::Font(caption_font.get()));
1171 #else 1171 #else
1172 return gfx::FontList(); 1172 return gfx::FontList();
1173 #endif 1173 #endif
1174 } 1174 }
1175 1175
1176 } // namespace internal 1176 } // namespace internal
1177 } // namespace views 1177 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/controls/menu/menu_config_win.cc ('k') | ui/views/win/hwnd_message_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698