Gtk: Change NULL to nullptr

chrome/browser/ui/libgtkui/gtk_ui.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/libgtkui/gtk_ui.h"
 
 #include <math.h>
 #include <pango/pango.h>
 #include <X11/Xcursor/Xcursor.h>
 
@@ skipping 64 matching lines @@
 #endif
 
 // A minimized port of GtkThemeService into something that can provide colors
 // and images for aura.
 //
 // TODO(erg): There's still a lot that needs ported or done for the first time:
 //
 // - Render and inject the omnibox background.
 // - Make sure to test with a light on dark theme, too.
 
-// Work around a header bug:
-// linux/debian_wheezy_i386-sysroot/usr/include/linux/stddef.h redefines NULL
-// to 0, which breaks -Wsentinel. Get back the normal definition of NULL.
-// TODO(thakis): Remove this once we update sysroots.
-#define __need_NULL
-#include <stddef.h>
-
 namespace libgtkui {
 
 namespace {
 
 const double kDefaultDPI = 96;
 
 class GtkButtonImageSource : public gfx::ImageSkiaSource {
  public:
   GtkButtonImageSource(const char* idr_string, gfx::Size size)
       : width_(size.width()), height_(size.height()) {
@@ skipping 46 matching lines @@
 #if GTK_MAJOR_VERSION == 2
     if (focus_)
       GTK_WIDGET_SET_FLAGS(button, GTK_HAS_FOCUS);
 
     int w, h;
     GdkPixmap* pixmap;
 
     {
       // http://crbug.com/346740
       ANNOTATE_SCOPED_MEMORY_LEAK;
-      pixmap = gtk_widget_get_snapshot(button, NULL);
+      pixmap = gtk_widget_get_snapshot(button, nullptr);
     }
 
     gdk_drawable_get_size(GDK_DRAWABLE(pixmap), &w, &h);
     GdkColormap* colormap = gdk_drawable_get_colormap(pixmap);
     GdkPixbuf* pixbuf = gdk_pixbuf_get_from_drawable(
-        NULL, GDK_DRAWABLE(pixmap), colormap, 0, 0, 0, 0, w, h);
+        nullptr, GDK_DRAWABLE(pixmap), colormap, 0, 0, 0, 0, w, h);
 
     gdk_cairo_set_source_pixbuf(cr, pixbuf, 0, 0);
     cairo_paint(cr);
 
     g_object_unref(pixbuf);
     g_object_unref(pixmap);
 #else
     GtkStyleContext* context = gtk_widget_get_style_context(button);
     gtk_render_background(context, cr, 0, 0, width, height);
     gtk_render_frame(context, cr, 0, 0, width, height);
@@ skipping 120 matching lines @@
       tint->l = 0.9;
   }
 }
 
 // Returns a gfx::FontRenderParams corresponding to GTK's configuration.
 gfx::FontRenderParams GetGtkFontRenderParams() {
   GtkSettings* gtk_settings = gtk_settings_get_default();
   CHECK(gtk_settings);
   gint antialias = 0;
   gint hinting = 0;
-  gchar* hint_style = NULL;
-  gchar* rgba = NULL;
+  gchar* hint_style = nullptr;
+  gchar* rgba = nullptr;
   g_object_get(gtk_settings, "gtk-xft-antialias", &antialias, "gtk-xft-hinting",
                &hinting, "gtk-xft-hintstyle", &hint_style, "gtk-xft-rgba",
-               &rgba, NULL);
+               &rgba, nullptr);
 
   gfx::FontRenderParams params;
   params.antialiasing = antialias != 0;
 
   if (hinting == 0 || !hint_style || strcmp(hint_style, "hintnone") == 0) {
     params.hinting = gfx::FontRenderParams::HINTING_NONE;
   } else if (strcmp(hint_style, "hintslight") == 0) {
     params.hinting = gfx::FontRenderParams::HINTING_SLIGHT;
   } else if (strcmp(hint_style, "hintmedium") == 0) {
     params.hinting = gfx::FontRenderParams::HINTING_MEDIUM;
@@ skipping 25 matching lines @@
   return params;
 }
 
 double GetDpi() {
   if (display::Display::HasForceDeviceScaleFactor())
     return display::Display::GetForcedDeviceScaleFactor() * kDefaultDPI;
 
   GtkSettings* gtk_settings = gtk_settings_get_default();
   CHECK(gtk_settings);
   gint gtk_dpi = -1;
-  g_object_get(gtk_settings, "gtk-xft-dpi", &gtk_dpi, NULL);
+  g_object_get(gtk_settings, "gtk-xft-dpi", &gtk_dpi, nullptr);
 
   // GTK multiplies the DPI by 1024 before storing it.
   return (gtk_dpi > 0) ? gtk_dpi / 1024.0 : kDefaultDPI;
 }
 
 float GetRawDeviceScaleFactor() {
   if (display::Display::HasForceDeviceScaleFactor())
     return display::Display::GetForcedDeviceScaleFactor();
   return GetDpi() / kDefaultDPI;
 }
@@ skipping 186 matching lines @@
 
   // Dividing GTK's cursor blink cycle time (in milliseconds) by this value
   // yields an appropriate value for
   // content::RendererPreferences::caret_blink_interval.  This matches the
   // logic in the WebKit GTK port.
   static const double kGtkCursorBlinkCycleFactor = 2000.0;
 
   gint cursor_blink_time = kGtkDefaultCursorBlinkTime;
   gboolean cursor_blink = TRUE;
   g_object_get(gtk_settings_get_default(), "gtk-cursor-blink-time",
-               &cursor_blink_time, "gtk-cursor-blink", &cursor_blink, NULL);
+               &cursor_blink_time, "gtk-cursor-blink", &cursor_blink, nullptr);
   return cursor_blink ? (cursor_blink_time / kGtkCursorBlinkCycleFactor) : 0.0;
 }
 
 ui::NativeTheme* GtkUi::GetNativeTheme(aura::Window* window) const {
-  ui::NativeTheme* native_theme_override = NULL;
+  ui::NativeTheme* native_theme_override = nullptr;
   if (!native_theme_overrider_.is_null())
     native_theme_override = native_theme_overrider_.Run(window);
 
   if (native_theme_override)
     return native_theme_override;
 
   return native_theme_;
 }
 
 void GtkUi::SetNativeThemeOverride(const NativeThemeGetter& callback) {
@@ skipping 54 matching lines @@
 
   std::string content_types[] = {content_type, kUnknownContentType};
 
   for (size_t i = 0; i < arraysize(content_types); ++i) {
     ScopedGIcon icon(g_content_type_get_icon(content_types[i].c_str()));
     ScopedGtkIconInfo icon_info(gtk_icon_theme_lookup_by_gicon(
         theme, icon.get(), size,
         static_cast<GtkIconLookupFlags>(GTK_ICON_LOOKUP_FORCE_SIZE)));
     if (!icon_info)
       continue;
-    ScopedGdkPixbuf pixbuf(gtk_icon_info_load_icon(icon_info.get(), NULL));
+    ScopedGdkPixbuf pixbuf(gtk_icon_info_load_icon(icon_info.get(), nullptr));
     if (!pixbuf)
       continue;
 
     SkBitmap bitmap = GdkPixbufToImageSkia(pixbuf.get());
     DCHECK_EQ(size, bitmap.width());
     DCHECK_EQ(size, bitmap.height());
     gfx::ImageSkia image_skia = gfx::ImageSkia::CreateFrom1xBitmap(bitmap);
     image_skia.MakeThreadSafe();
     return gfx::Image(image_skia);
   }
@@ skipping 427 matching lines @@
 
 float GtkUi::GetDeviceScaleFactor() const {
   return device_scale_factor_;
 }
 
 }  // namespace libgtkui
 
 views::LinuxUI* BuildGtkUi() {
   return new libgtkui::GtkUi;
 }