OLD | NEW |
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 "chrome/browser/ui/libgtk2ui/gtk2_ui.h" | 5 #include "chrome/browser/ui/libgtk2ui/gtk2_ui.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 | 8 |
9 #include <pango/pango.h> | 9 #include <pango/pango.h> |
10 | 10 |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
57 #endif | 57 #endif |
58 | 58 |
59 // A minimized port of GtkThemeService into something that can provide colors | 59 // A minimized port of GtkThemeService into something that can provide colors |
60 // and images for aura. | 60 // and images for aura. |
61 // | 61 // |
62 // TODO(erg): There's still a lot that needs ported or done for the first time: | 62 // TODO(erg): There's still a lot that needs ported or done for the first time: |
63 // | 63 // |
64 // - Render and inject the omnibox background. | 64 // - Render and inject the omnibox background. |
65 // - Make sure to test with a light on dark theme, too. | 65 // - Make sure to test with a light on dark theme, too. |
66 | 66 |
| 67 // Work around a header bug: |
| 68 // linux/debian_wheezy_i386-sysroot/usr/include/linux/stddef.h redefines NULL |
| 69 // to 0, which breaks -Wsentinel. Get back the normal definition of NULL. |
| 70 // TODO(thakis): Remove this once we update sysroots. |
| 71 #define __need_NULL |
| 72 #include <stddef.h> |
| 73 |
67 namespace libgtk2ui { | 74 namespace libgtk2ui { |
68 | 75 |
69 namespace { | 76 namespace { |
70 | 77 |
71 struct GObjectDeleter { | 78 struct GObjectDeleter { |
72 void operator()(void* ptr) { | 79 void operator()(void* ptr) { |
73 g_object_unref(ptr); | 80 g_object_unref(ptr); |
74 } | 81 } |
75 }; | 82 }; |
76 struct GtkIconInfoDeleter { | 83 struct GtkIconInfoDeleter { |
(...skipping 1259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1336 ClearAllThemeData(); | 1343 ClearAllThemeData(); |
1337 LoadGtkValues(); | 1344 LoadGtkValues(); |
1338 NativeThemeGtk2::instance()->NotifyObservers(); | 1345 NativeThemeGtk2::instance()->NotifyObservers(); |
1339 } | 1346 } |
1340 | 1347 |
1341 } // namespace libgtk2ui | 1348 } // namespace libgtk2ui |
1342 | 1349 |
1343 views::LinuxUI* BuildGtk2UI() { | 1350 views::LinuxUI* BuildGtk2UI() { |
1344 return new libgtk2ui::Gtk2UI; | 1351 return new libgtk2ui::Gtk2UI; |
1345 } | 1352 } |
OLD | NEW |