Factor out icon ID logic in WebsiteSettingsUI

chrome/browser/ui/website_settings/website_settings_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/website_settings/website_settings_ui.h"
 
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 162 matching lines @@
     default:
       NOTREACHED();
       return string16();
   }
   int button_text_id = button_text_ids[effective_setting];
   DCHECK_NE(button_text_id, kInvalidResourceID);
   return l10n_util::GetStringUTF16(button_text_id);
 }
 
 // static
-const gfx::Image& WebsiteSettingsUI::GetPermissionIcon(
-    ContentSettingsType type,
-    ContentSetting setting) {
+int WebsiteSettingsUI::GetPermissionIconID(ContentSettingsType type,
+                                           ContentSetting setting) {
   bool use_blocked = (setting == CONTENT_SETTING_BLOCK);
   int resource_id = IDR_INFO;
   switch (type) {
     case CONTENT_SETTINGS_TYPE_IMAGES:
       resource_id = use_blocked ? IDR_BLOCKED_IMAGES
                                 : IDR_ALLOWED_IMAGES;
       break;
     case CONTENT_SETTINGS_TYPE_JAVASCRIPT:
       resource_id = use_blocked ? IDR_BLOCKED_JAVASCRIPT
                                 : IDR_ALLOWED_JAVASCRIPT;
@@ skipping 26 matching lines @@
                                 : IDR_ALLOWED_MOUSE_CURSOR;
       break;
     case CONTENT_SETTINGS_TYPE_MEDIASTREAM:
       resource_id = use_blocked ? IDR_BLOCKED_MEDIA
                                 : IDR_ASK_MEDIA;
       break;
     default:
       NOTREACHED();
       break;
   }
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-  return rb.GetNativeImageNamed(resource_id);
+  return resource_id;
 }
 
 // static
-const gfx::Image& WebsiteSettingsUI::GetIdentityIcon(
+const gfx::Image& WebsiteSettingsUI::GetPermissionIcon(
+    ContentSettingsType type,
+    ContentSetting setting) {
+  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  return rb.GetNativeImageNamed(GetPermissionIconID(type, setting));
+}
+
+// static
+int WebsiteSettingsUI::GetIdentityIconID(
     WebsiteSettings::SiteIdentityStatus status) {
   int resource_id = IDR_PAGEINFO_INFO;
   switch (status) {
     case WebsiteSettings::SITE_IDENTITY_STATUS_UNKNOWN:
       break;
     case WebsiteSettings::SITE_IDENTITY_STATUS_CERT:
     case WebsiteSettings::SITE_IDENTITY_STATUS_EV_CERT:
       resource_id = IDR_PAGEINFO_GOOD;
       break;
     case WebsiteSettings::SITE_IDENTITY_STATUS_CERT_REVOCATION_UNKNOWN:
       resource_id = IDR_PAGEINFO_WARNING_MINOR;
       break;
     case WebsiteSettings::SITE_IDENTITY_STATUS_NO_CERT:
       resource_id = IDR_PAGEINFO_WARNING_MAJOR;
       break;
     case WebsiteSettings::SITE_IDENTITY_STATUS_ERROR:
       resource_id = IDR_PAGEINFO_BAD;
       break;
     case WebsiteSettings::SITE_IDENTITY_STATUS_ADMIN_PROVIDED_CERT:
       resource_id = IDR_CONTROLLED_SETTING_MANDATORY_LARGE;
       break;
     default:
       NOTREACHED();
       break;
   }
-  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-  return rb.GetNativeImageNamed(resource_id);
+  return resource_id;
 }
 
 // static
-const gfx::Image& WebsiteSettingsUI::GetConnectionIcon(
+const gfx::Image& WebsiteSettingsUI::GetIdentityIcon(
+    WebsiteSettings::SiteIdentityStatus status) {
+  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  return rb.GetNativeImageNamed(GetIdentityIconID(status));
+}
+
+// static
+int WebsiteSettingsUI::GetConnectionIconID(
     WebsiteSettings::SiteConnectionStatus status) {
   int resource_id = IDR_PAGEINFO_INFO;
   switch (status) {
     case WebsiteSettings::SITE_CONNECTION_STATUS_UNKNOWN:
       break;
     case WebsiteSettings::SITE_CONNECTION_STATUS_ENCRYPTED:
       resource_id = IDR_PAGEINFO_GOOD;
       break;
     case WebsiteSettings::SITE_CONNECTION_STATUS_MIXED_CONTENT:
       resource_id = IDR_PAGEINFO_WARNING_MINOR;
       break;
     case WebsiteSettings::SITE_CONNECTION_STATUS_UNENCRYPTED:
       resource_id = IDR_PAGEINFO_WARNING_MAJOR;
       break;
     case WebsiteSettings::SITE_CONNECTION_STATUS_ENCRYPTED_ERROR:
       resource_id = IDR_PAGEINFO_BAD;
       break;
     default:
       NOTREACHED();
       break;
   }
+  return resource_id;
+}
+
+// static
+const gfx::Image& WebsiteSettingsUI::GetConnectionIcon(
+    WebsiteSettings::SiteConnectionStatus status) {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-  return rb.GetNativeImageNamed(resource_id);
+  return rb.GetNativeImageNamed(GetConnectionIconID(status));
+}
+
+// static
+int WebsiteSettingsUI::GetFirstVisitIconID(const string16& first_visit) {
+  // FIXME(markusheintz): Display a minor warning icon if the page is visited
+  // the first time.
+  return IDR_PAGEINFO_INFO;
 }
 
 // static
 const gfx::Image& WebsiteSettingsUI::GetFirstVisitIcon(
     const string16& first_visit) {
-  // FIXME(markusheintz): Display a minor warning icon if the page is visited
-  // the first time.
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-  return rb.GetNativeImageNamed(IDR_PAGEINFO_INFO);
+  return rb.GetNativeImageNamed(GetFirstVisitIconID(first_visit));
 }