summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authordimich@google.com <dimich@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-19 21:39:54 +0000
committerdimich@google.com <dimich@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-19 21:39:54 +0000
commit523b6f9530faa6429f2ed4ad96442d1b53ee6190 (patch)
tree432175be8bb07b19b5adf93deb3e3b1b64e48c6a /chrome/common
parent34d28ddce64512e2227c566d47ca238401c57e48 (diff)
downloadchromium_src-523b6f9530faa6429f2ed4ad96442d1b53ee6190.zip
chromium_src-523b6f9530faa6429f2ed4ad96442d1b53ee6190.tar.gz
chromium_src-523b6f9530faa6429f2ed4ad96442d1b53ee6190.tar.bz2
Degrade the https color and lock icon for the page that has a worker that loads subresource with bad cert.
The idea is to make UI reflect loading of resources with bad certificates that were previously approved by the user. bug=20176 TEST=SSLUITest.TestUnsafeContentsInWorker unit_test. Review URL: http://codereview.chromium.org/268006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29461 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/child_process_host.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/common/child_process_host.cc b/chrome/common/child_process_host.cc
index 1d48350..7327769 100644
--- a/chrome/common/child_process_host.cc
+++ b/chrome/common/child_process_host.cc
@@ -250,8 +250,10 @@ ChildProcessHost::Iterator::Iterator()
ChildProcessHost::Iterator::Iterator(ProcessType type)
: all_(false), type_(type) {
- DCHECK(MessageLoop::current() ==
- ChromeThread::GetMessageLoop(ChromeThread::IO)) <<
+ // IO loop can be NULL in unit tests.
+ DCHECK(!ChromeThread::GetMessageLoop(ChromeThread::IO) ||
+ MessageLoop::current() ==
+ ChromeThread::GetMessageLoop(ChromeThread::IO)) <<
"ChildProcessInfo::Iterator must be used on the IO thread.";
iterator_ = Singleton<ChildProcessList>::get()->begin();
if (!Done() && (*iterator_)->type() != type_)