Add Permissions to the PageInfo dialog on Android

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 "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 261 matching lines @@
       resource_id = IDR_PAGEINFO_BAD;
       break;
     case WebsiteSettings::SITE_IDENTITY_STATUS_ADMIN_PROVIDED_CERT:
       resource_id = IDR_PAGEINFO_ENTERPRISE_MANAGED;
       break;
     case WebsiteSettings::SITE_IDENTITY_STATUS_DEPRECATED_SIGNATURE_ALGORITHM:
       resource_id = IDR_PAGEINFO_WARNING_MINOR;
       break;
     default:
       NOTREACHED();
       break;

[Finnur, 2014/10/21 15:49:34]

I would delete this default: case.

If you do, you'll get a compile error because a case statement is missing for
SITE_IDENTITY_STATUS_INTERNAL_PAGE. When you add that and make a similar fix
later in this file (see below), the interactive test will start passing.

What should the resource_id should be for this new case? Perhaps best if if you
answer that. I used IDR_PAGEINFO_INFO, but maybe IDR_PAGEINFO_GOOD is
appropriate?

[sashab, 2014/10/22 09:35:00]

Added INTERNAL_PAGE to have IDR_PAGEINFO_INFO. The truth is I don't think it
matters, since this code path can't be reached outside of the test (internal
pages on desktop don't have connection info bubbles... yet - they will when we
overhaul the origin info bubble on desktop).

   }
   return resource_id;
 }
 
 // static
 const gfx::Image& WebsiteSettingsUI::GetIdentityIcon(
     WebsiteSettings::SiteIdentityStatus status) {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   return rb.GetNativeImageNamed(GetIdentityIconID(status));
 }
@@ skipping 12 matching lines @@
       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;

[Finnur, 2014/10/21 15:49:34]

Also delete this default case. Then you'll find that
SITE_CONNECTION_STATUS_INTERNAL_PAGE is also missing.

[sashab, 2014/10/22 09:35:00]

Done.

   }
   return resource_id;
 }
 
 // static
 const gfx::Image& WebsiteSettingsUI::GetConnectionIcon(
     WebsiteSettings::SiteConnectionStatus status) {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   return rb.GetNativeImageNamed(GetConnectionIconID(status));
 }
 
 // static
 int WebsiteSettingsUI::GetFirstVisitIconID(const base::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 base::string16& first_visit) {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   return rb.GetNativeImageNamed(GetFirstVisitIconID(first_visit));
 }
-
-// static
-int WebsiteSettingsUI::GetConnectionSummaryMessageID(
-    WebsiteSettings::SiteConnectionStatus status) {
-  switch (status) {
-    case WebsiteSettings::SITE_CONNECTION_STATUS_UNKNOWN:
-      return IDS_PAGE_INFO_UNENCRYPTED_CONNECTION_SUMMARY_TEXT;
-    case WebsiteSettings::SITE_CONNECTION_STATUS_ENCRYPTED:
-      return IDS_PAGE_INFO_ENCRYPTED_CONNECTION_SUMMARY_TEXT;
-    case WebsiteSettings::SITE_CONNECTION_STATUS_MIXED_CONTENT:
-      return IDS_PAGE_INFO_MIXED_CONTENT_CONNECTION_SUMMARY_TEXT;
-    case WebsiteSettings::SITE_CONNECTION_STATUS_UNENCRYPTED:
-      return IDS_PAGE_INFO_UNENCRYPTED_CONNECTION_SUMMARY_TEXT;
-    case WebsiteSettings::SITE_CONNECTION_STATUS_ENCRYPTED_ERROR:
-      return IDS_PAGE_INFO_UNENCRYPTED_CONNECTION_SUMMARY_TEXT;
-    case WebsiteSettings::SITE_CONNECTION_STATUS_INTERNAL_PAGE:
-      return IDS_PAGE_INFO_INTERNAL_PAGE;
-    default:
-      NOTREACHED();
-      return 0;
-  }
-}