summaryrefslogtreecommitdiffstats
path: root/chrome/browser/page_info_model.h
diff options
context:
space:
mode:
authorfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-27 09:28:24 +0000
committerfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-27 09:28:24 +0000
commit740ea16768c51c8d17d9242791e4dc411d978bfe (patch)
tree8bfe40f527f151698372d0b2e650fe3e4fbf769f /chrome/browser/page_info_model.h
parentf1869a3fbea7eb533b3e7cead99b80f9b32323f5 (diff)
downloadchromium_src-740ea16768c51c8d17d9242791e4dc411d978bfe.zip
chromium_src-740ea16768c51c8d17d9242791e4dc411d978bfe.tar.gz
chromium_src-740ea16768c51c8d17d9242791e4dc411d978bfe.tar.bz2
Add mixed content warning to the Page Info bubble.
BUG=http://crbug.com/52916 TEST=Navigate to a page with mixed http and https content. The gray padlock should appear in the Omnibox icon and in the infobubble when you click it. Review URL: http://codereview.chromium.org/3171031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57654 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/page_info_model.h')
-rw-r--r--chrome/browser/page_info_model.h14
1 files changed, 11 insertions, 3 deletions
diff --git a/chrome/browser/page_info_model.h b/chrome/browser/page_info_model.h
index 60e3883..08a9b56 100644
--- a/chrome/browser/page_info_model.h
+++ b/chrome/browser/page_info_model.h
@@ -35,8 +35,16 @@ class PageInfoModel {
SECTION_INFO_FIRST_VISIT,
};
+ enum SectionInfoState {
+ SECTION_STATE_OK = 0,
+ // If state is OK but contains mixed content.
+ SECTION_STATE_WARNING,
+ // For example, unverified identity over HTTPS.
+ SECTION_STATE_ERROR,
+ };
+
struct SectionInfo {
- SectionInfo(bool state,
+ SectionInfo(SectionInfoState state,
const string16& title,
const string16& headline,
const string16& description,
@@ -48,8 +56,8 @@ class PageInfoModel {
type(type) {
}
- bool state; // True if state is OK, false otherwise (ex of bad states:
- // unverified identity over HTTPS).
+ // The overall state of the connection (error, warning, ok).
+ SectionInfoState state;
// The title of the section.
string16 title;