| Index: ui/gfx/x/x11_atom_cache.cc
|
| diff --git a/ui/gfx/x/x11_atom_cache.cc b/ui/gfx/x/x11_atom_cache.cc
|
| index cc5d5eb3f6a861beeb3b83a376452d7001a42edb..5288d6d287f248e8078248ad1b09ed215d2334d1 100644
|
| --- a/ui/gfx/x/x11_atom_cache.cc
|
| +++ b/ui/gfx/x/x11_atom_cache.cc
|
| @@ -12,12 +12,12 @@
|
|
|
| namespace ui {
|
|
|
| -X11AtomCache::X11AtomCache(XDisplay* xdisplay, const char** to_cache)
|
| +X11AtomCache::X11AtomCache(XDisplay* xdisplay, const char* const* to_cache)
|
| : xdisplay_(xdisplay),
|
| uncached_atoms_allowed_(false) {
|
| int cache_count = 0;
|
| - for (const char** i = to_cache; *i != NULL; i++)
|
| - cache_count++;
|
| + for (const char* const* i = to_cache; *i; ++i)
|
| + ++cache_count;
|
|
|
| scoped_ptr<XAtom[]> cached_atoms(new XAtom[cache_count]);
|
|
|
|
|