Cleanup nits in content_setting*model.

chrome/browser/ui/content_settings/content_setting_image_model.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/content_settings/content_setting_image_model.h"
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "build/build_config.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
@@ skipping 86 matching lines @@
 namespace {
 
 struct ContentSettingsImageDetails {
   ContentSettingsType type;
   gfx::VectorIconId icon_id;
   int blocked_tooltip_id;
   int blocked_explanatory_text_id;
   int accessed_tooltip_id;
 };
 
-static const ContentSettingsImageDetails kImageDetails[] = {
-    {CONTENT_SETTINGS_TYPE_COOKIES,
-     gfx::VectorIconId::COOKIE,
-     IDS_BLOCKED_COOKIES_TITLE,
-     0,
-     IDS_ACCESSED_COOKIES_TITLE},
-    {CONTENT_SETTINGS_TYPE_IMAGES,
-     gfx::VectorIconId::IMAGE,
-     IDS_BLOCKED_IMAGES_TITLE,
-     0,
-     0},
-    {CONTENT_SETTINGS_TYPE_JAVASCRIPT,
-     gfx::VectorIconId::CODE,
-     IDS_BLOCKED_JAVASCRIPT_TITLE,
-     0,
-     0},
-    {CONTENT_SETTINGS_TYPE_PLUGINS,
-     gfx::VectorIconId::EXTENSION,
-     IDS_BLOCKED_PLUGINS_MESSAGE,
-     IDS_BLOCKED_PLUGIN_EXPLANATORY_TEXT,
-     0},
-    {CONTENT_SETTINGS_TYPE_POPUPS,
-     gfx::VectorIconId::WEB,
-     IDS_BLOCKED_POPUPS_TOOLTIP,
-     IDS_BLOCKED_POPUPS_EXPLANATORY_TEXT,
-     0},
-    {CONTENT_SETTINGS_TYPE_MIXEDSCRIPT,
-     gfx::VectorIconId::MIXED_CONTENT,
-     IDS_BLOCKED_DISPLAYING_INSECURE_CONTENT,
-     0,
-     0},
-    {CONTENT_SETTINGS_TYPE_PPAPI_BROKER,
-     gfx::VectorIconId::EXTENSION,
-     IDS_BLOCKED_PPAPI_BROKER_TITLE,
-     0,
-     IDS_ALLOWED_PPAPI_BROKER_TITLE},
+const ContentSettingsImageDetails kImageDetails[] = {
+    {CONTENT_SETTINGS_TYPE_COOKIES, gfx::VectorIconId::COOKIE,
+     IDS_BLOCKED_COOKIES_TITLE, 0, IDS_ACCESSED_COOKIES_TITLE},
+    {CONTENT_SETTINGS_TYPE_IMAGES, gfx::VectorIconId::IMAGE,
+     IDS_BLOCKED_IMAGES_TITLE, 0, 0},
+    {CONTENT_SETTINGS_TYPE_JAVASCRIPT, gfx::VectorIconId::CODE,
+     IDS_BLOCKED_JAVASCRIPT_TITLE, 0, 0},
+    {CONTENT_SETTINGS_TYPE_PLUGINS, gfx::VectorIconId::EXTENSION,
+     IDS_BLOCKED_PLUGINS_MESSAGE, IDS_BLOCKED_PLUGIN_EXPLANATORY_TEXT, 0},
+    {CONTENT_SETTINGS_TYPE_POPUPS, gfx::VectorIconId::WEB,
+     IDS_BLOCKED_POPUPS_TOOLTIP, IDS_BLOCKED_POPUPS_EXPLANATORY_TEXT, 0},
+    {CONTENT_SETTINGS_TYPE_MIXEDSCRIPT, gfx::VectorIconId::MIXED_CONTENT,
+     IDS_BLOCKED_DISPLAYING_INSECURE_CONTENT, 0, 0},
+    {CONTENT_SETTINGS_TYPE_PPAPI_BROKER, gfx::VectorIconId::EXTENSION,
+     IDS_BLOCKED_PPAPI_BROKER_TITLE, 0, IDS_ALLOWED_PPAPI_BROKER_TITLE},
     {CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS,
-     gfx::VectorIconId::FILE_DOWNLOAD,
-     IDS_BLOCKED_DOWNLOAD_TITLE,
-     IDS_BLOCKED_DOWNLOADS_EXPLANATION,
-     IDS_ALLOWED_DOWNLOAD_TITLE},
+     gfx::VectorIconId::FILE_DOWNLOAD, IDS_BLOCKED_DOWNLOAD_TITLE,
+     IDS_BLOCKED_DOWNLOADS_EXPLANATION, IDS_ALLOWED_DOWNLOAD_TITLE},
 };
 
 const ContentSettingsImageDetails* GetImageDetails(ContentSettingsType type) {
   for (const ContentSettingsImageDetails& image_details : kImageDetails) {
     if (image_details.type == type)
       return &image_details;
   }
   return nullptr;
 }
 
@@ skipping 98 matching lines @@
       TabSpecificContentSettings::FromWebContents(web_contents);
   if (!content_settings)
     return;
   if (!content_settings->IsContentBlocked(type)) {
     if (!content_settings->IsContentAllowed(type))
       return;
 
     // For cookies, only show the cookie blocked page action if cookies are
     // blocked by default.
     if (type == CONTENT_SETTINGS_TYPE_COOKIES &&
-        (map->GetDefaultContentSetting(type, NULL) != CONTENT_SETTING_BLOCK))
+        (map->GetDefaultContentSetting(type, nullptr) != CONTENT_SETTING_BLOCK))
       return;
 
     tooltip_id = image_details->accessed_tooltip_id;
     explanation_id = 0;
   }
   set_visible(true);
   gfx::VectorIconId badge_id = gfx::VectorIconId::VECTOR_ICON_NONE;
   if (type == CONTENT_SETTINGS_TYPE_PPAPI_BROKER)
     badge_id = gfx::VectorIconId::WARNING_BADGE;
   else if (content_settings->IsContentBlocked(type))
@@ skipping 22 matching lines @@
     return;
   const ContentSettingsUsagesState& usages_state = content_settings->
       geolocation_usages_state();
   if (usages_state.state_map().empty())
     return;
   set_visible(true);
 
   // If any embedded site has access the allowed icon takes priority over the
   // blocked icon.
   unsigned int state_flags = 0;
-  usages_state.GetDetailedInfo(NULL, &state_flags);
+  usages_state.GetDetailedInfo(nullptr, &state_flags);
   bool allowed =
       !!(state_flags & ContentSettingsUsagesState::TABSTATE_HAS_ANY_ALLOWED);
   set_icon_by_vector_id(gfx::VectorIconId::MY_LOCATION,
                         allowed ? gfx::VectorIconId::VECTOR_ICON_NONE
                                 : gfx::VectorIconId::BLOCKED_BADGE);
   set_tooltip(l10n_util::GetStringUTF16(allowed
                                             ? IDS_GEOLOCATION_ALLOWED_TOOLTIP
                                             : IDS_GEOLOCATION_BLOCKED_TOOLTIP));
 }
 
@@ skipping 177 matching lines @@
     return;
   const ContentSettingsUsagesState& usages_state =
       content_settings->midi_usages_state();
   if (usages_state.state_map().empty())
     return;
   set_visible(true);
 
   // If any embedded site has access the allowed icon takes priority over the
   // blocked icon.
   unsigned int state_flags = 0;
-  usages_state.GetDetailedInfo(NULL, &state_flags);
+  usages_state.GetDetailedInfo(nullptr, &state_flags);
   bool allowed =
       !!(state_flags & ContentSettingsUsagesState::TABSTATE_HAS_ANY_ALLOWED);
   set_icon_by_vector_id(gfx::VectorIconId::MIDI,
                         allowed ? gfx::VectorIconId::VECTOR_ICON_NONE
                                 : gfx::VectorIconId::BLOCKED_BADGE);
   set_tooltip(l10n_util::GetStringUTF16(allowed
                                             ? IDS_MIDI_SYSEX_ALLOWED_TOOLTIP
                                             : IDS_MIDI_SYSEX_BLOCKED_TOOLTIP));
 }
 
@@ skipping 51 matching lines @@
 
 #if defined(OS_MACOSX)
 bool ContentSettingImageModel::UpdateFromWebContentsAndCheckIfIconChanged(
     content::WebContents* web_contents) {
   gfx::VectorIconId old_icon = icon_id_;
   gfx::VectorIconId old_badge_icon = icon_badge_id_;
   UpdateFromWebContents(web_contents);
   return old_icon != icon_id_ && old_badge_icon != icon_badge_id_;
 }
 #endif