diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-15 00:38:36 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-15 00:38:36 +0000 |
| commit | 18de157f6c4c5eee14ad84e037def47a7f52a3a8 (patch) | |
| tree | ade764c9a40927c1856a759d0f92e6456bf7f2ea /chrome/browser/tab_contents/tab_contents.h | |
| parent | 429e1ec2b634ce856c43f077ae6d18d537fc86f2 (diff) | |
| download | chromium_src-18de157f6c4c5eee14ad84e037def47a7f52a3a8.zip chromium_src-18de157f6c4c5eee14ad84e037def47a7f52a3a8.tar.gz chromium_src-18de157f6c4c5eee14ad84e037def47a7f52a3a8.tar.bz2 | |
(Original patch reviewed at http://codereview.chromium.org/2067003 )
Track "display" and "run" separately for mixed content, and make the latter downgrade the SSL state to "authentication broken".
Make the "display" state only affect the current tab (not the entire host).
Fix an SSL browser test by supplying the appropriate SiteInstance*.
Move a test from "disabled" to "flaky" since it at least passes for me.
Make the SSLManager header and .cc files put functions in the same order, and make that order somewhat saner.
BUG=15072, 18626, 40932, 42758
TEST=Covered by browser tests
Review URL: http://codereview.chromium.org/2063008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47347 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents/tab_contents.h')
| -rw-r--r-- | chrome/browser/tab_contents/tab_contents.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/browser/tab_contents/tab_contents.h b/chrome/browser/tab_contents/tab_contents.h index 78465ec..c657d55 100644 --- a/chrome/browser/tab_contents/tab_contents.h +++ b/chrome/browser/tab_contents/tab_contents.h @@ -298,6 +298,10 @@ class TabContents : public PageNavigator, // navigation state change to trigger repaint of title. void SetAppIcon(const SkBitmap& app_icon); + bool displayed_insecure_content() const { + return displayed_insecure_content_; + } + // Internal state ------------------------------------------------------------ // This flag indicates whether the tab contents is currently being @@ -1135,6 +1139,9 @@ class TabContents : public PageNavigator, // Stores which content setting types actually have blocked content. bool content_blocked_[CONTENT_SETTINGS_NUM_TYPES]; + // True if this is a secure page which displayed insecure content. + bool displayed_insecure_content_; + // Data for shelves and stuff ------------------------------------------------ // Delegates for InfoBars associated with this TabContents. |