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

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

Issue 8520026: Fix statics in NativeTheme*::instance() to avoid destruction post main (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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 | « ui/gfx/native_theme_chromeos.cc ('k') | ui/gfx/native_theme_win.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/native_theme_gtk.h" 5 #include "ui/gfx/native_theme_gtk.h"
6 6
7 #include "base/basictypes.h"
8
7 namespace gfx { 9 namespace gfx {
8 10
9 // static 11 // static
10 const NativeTheme* NativeTheme::instance() { 12 const NativeTheme* NativeTheme::instance() {
11 return NativeThemeGtk::instance(); 13 return NativeThemeGtk::instance();
12 } 14 }
13 15
14 // static 16 // static
15 const NativeThemeGtk* NativeThemeGtk::instance() { 17 const NativeThemeGtk* NativeThemeGtk::instance() {
16 CR_DEFINE_STATIC_LOCAL(NativeThemeGtk, s_native_theme, ()); 18 CR_DEFINE_STATIC_LOCAL(NativeThemeGtk, s_native_theme, ());
17 return &s_native_theme; 19 return &s_native_theme;
18 } 20 }
19 21
20 NativeThemeGtk::NativeThemeGtk() { 22 NativeThemeGtk::NativeThemeGtk() {
21 } 23 }
22 24
23 NativeThemeGtk::~NativeThemeGtk() { 25 NativeThemeGtk::~NativeThemeGtk() {
24 } 26 }
25 27
26 } // namespace gfx 28 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gfx/native_theme_chromeos.cc ('k') | ui/gfx/native_theme_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698