equal
deleted
inserted
replaced
21 |
21 |
22 #include <QSslError> |
22 #include <QSslError> |
23 |
23 |
24 #include "secureuicontroller_p.h" |
24 #include "secureuicontroller_p.h" |
25 #include "secureuicontroller.h" |
25 #include "secureuicontroller.h" |
|
26 #include "webpagecontroller.h" |
26 |
27 |
27 namespace WRT { |
28 namespace WRT { |
28 |
29 |
29 SecureUIControllerPrivate::SecureUIControllerPrivate(SecureUIController* qq) : |
30 SecureUIControllerPrivate::SecureUIControllerPrivate(SecureUIController* qq) : |
30 q(qq), |
31 q(qq), |
185 * emit untrustedMixedLoadFinished for the following case: |
186 * emit untrustedMixedLoadFinished for the following case: |
186 * -# Top Level Loaded, Secure, with certificate error, with unsecure subload |
187 * -# Top Level Loaded, Secure, with certificate error, with unsecure subload |
187 * |
188 * |
188 * This function should be called when the final load ended. |
189 * This function should be called when the final load ended. |
189 */ |
190 */ |
190 void SecureUIController::endSecureCheck(bool) |
191 void SecureUIController::endSecureCheck(bool loadFinished) |
191 { |
192 { |
192 //qDebug()<<"endSecureCheck Internal state = "<<d->m_internalState; |
193 //qDebug()<<"endSecureCheck Internal state = "<<d->m_internalState; |
193 |
194 |
|
195 if (!loadFinished) |
|
196 setTopLevelScheme(WebPageController::getSingleton()->currentDocUrl()); |
|
197 |
194 /* Save the current secure state */ |
198 /* Save the current secure state */ |
195 determineSecureState(); |
199 determineSecureState(); |
196 |
200 |
197 emit pageSecureState(d->m_secureState); |
201 emit pageSecureState(d->m_secureState); |
198 |
202 |