Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1417)

Unified Diff: chrome/browser/ui/website_settings/website_settings_ui.cc

Issue 516703002: Replaced the current WebsiteSettings dialog with a new PageInfo dialog (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Review feedback & switched to new enum system Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/website_settings/website_settings_ui.cc
diff --git a/chrome/browser/ui/website_settings/website_settings_ui.cc b/chrome/browser/ui/website_settings/website_settings_ui.cc
index c611d13f48fdaede97178267f494a7dda245e060..d75afc39e2a261084c549d556f63a1937557e6eb 100644
--- a/chrome/browser/ui/website_settings/website_settings_ui.cc
+++ b/chrome/browser/ui/website_settings/website_settings_ui.cc
@@ -4,7 +4,8 @@
#include "chrome/browser/ui/website_settings/website_settings_ui.h"
-#include "chrome/grit/generated_resources.h"
+#include "grit/chromium_strings.h"
+#include "grit/generated_resources.h"
#include "grit/theme_resources.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
@@ -333,3 +334,33 @@ const gfx::Image& WebsiteSettingsUI::GetFirstVisitIcon(
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
return rb.GetNativeImageNamed(GetFirstVisitIconID(first_visit));
}
+
+// static
+int WebsiteSettingsUI::GetConnectionSummaryMessageID(
+ WebsiteSettings::SiteConnectionStatus status) {
+ int resource_id = IDS_PAGE_INFO_UNKNOWN_CONNECTION_SUMMARY_TEXT;
+ switch (status) {
+ case WebsiteSettings::SITE_CONNECTION_STATUS_UNKNOWN:
+ resource_id = IDS_PAGE_INFO_UNKNOWN_CONNECTION_SUMMARY_TEXT;
Ted C 2014/09/23 03:56:16 Instead of keeping a resource_id reference, I woul
sashab 2014/09/29 04:17:12 No prob - was copying from above but they are actu
+ break;
+ case WebsiteSettings::SITE_CONNECTION_STATUS_ENCRYPTED:
+ resource_id = IDS_PAGE_INFO_ENCRYPTED_CONNECTION_SUMMARY_TEXT;
+ break;
+ case WebsiteSettings::SITE_CONNECTION_STATUS_MIXED_CONTENT:
+ resource_id = IDS_PAGE_INFO_MIXED_CONTENT_CONNECTION_SUMMARY_TEXT;
+ break;
+ case WebsiteSettings::SITE_CONNECTION_STATUS_UNENCRYPTED:
+ resource_id = IDS_PAGE_INFO_UNENCRYPTED_CONNECTION_SUMMARY_TEXT;
+ break;
+ case WebsiteSettings::SITE_CONNECTION_STATUS_ENCRYPTED_ERROR:
+ resource_id = IDS_PAGE_INFO_UNKNOWN_CONNECTION_SUMMARY_TEXT;
+ break;
+ case WebsiteSettings::SITE_CONNECTION_STATUS_INTERNAL_PAGE:
+ resource_id = IDS_PAGE_INFO_INTERNAL_PAGE;
+ break;
+ default:
+ NOTREACHED();
+ break;
+ }
+ return resource_id;
+}

Powered by Google App Engine
This is Rietveld 408576698