| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/chromeos/login/web_page_view.h" | 5 #include "chrome/browser/chromeos/login/web_page_view.h" |
| 6 | 6 |
| 7 #include "app/l10n_util.h" | 7 #include "app/l10n_util.h" |
| 8 #include "app/resource_bundle.h" | 8 #include "app/resource_bundle.h" |
| 9 #include "base/callback.h" | 9 #include "base/callback.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 const std::string& security_origin) { | 76 const std::string& security_origin) { |
| 77 LOG(ERROR) << "Page load failed: did run insecure content"; | 77 LOG(ERROR) << "Page load failed: did run insecure content"; |
| 78 page_delegate_->OnPageLoadFailed(security_origin); | 78 page_delegate_->OnPageLoadFailed(security_origin); |
| 79 } | 79 } |
| 80 | 80 |
| 81 void WizardWebPageViewTabContents::DocumentLoadedInFrame( | 81 void WizardWebPageViewTabContents::DocumentLoadedInFrame( |
| 82 long long /*frame_id*/) { | 82 long long /*frame_id*/) { |
| 83 page_delegate_->OnPageLoaded(); | 83 page_delegate_->OnPageLoaded(); |
| 84 } | 84 } |
| 85 | 85 |
| 86 void WizardWebPageViewTabContents::DidFinishLoad( |
| 87 long long /*frame_id*/) { |
| 88 } |
| 89 |
| 86 void WizardWebPageViewTabContents::OnContentBlocked(ContentSettingsType type) { | 90 void WizardWebPageViewTabContents::OnContentBlocked(ContentSettingsType type) { |
| 87 LOG(ERROR) << "Page load failed: content blocked. Type: " << type; | 91 LOG(ERROR) << "Page load failed: content blocked. Type: " << type; |
| 88 page_delegate_->OnPageLoadFailed(""); | 92 page_delegate_->OnPageLoadFailed(""); |
| 89 } | 93 } |
| 90 | 94 |
| 91 /////////////////////////////////////////////////////////////////////////////// | 95 /////////////////////////////////////////////////////////////////////////////// |
| 92 // WebPageDomView, public: | 96 // WebPageDomView, public: |
| 93 | 97 |
| 94 void WebPageDomView::SetTabContentsDelegate( | 98 void WebPageDomView::SetTabContentsDelegate( |
| 95 TabContentsDelegate* delegate) { | 99 TabContentsDelegate* delegate) { |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 177 throbber_->GetPreferredSize().width(), | 181 throbber_->GetPreferredSize().width(), |
| 178 throbber_->GetPreferredSize().height()); | 182 throbber_->GetPreferredSize().height()); |
| 179 connecting_label_->SetBounds( | 183 connecting_label_->SetBounds( |
| 180 width() / 2 - connecting_label_->GetPreferredSize().width() / 2, | 184 width() / 2 - connecting_label_->GetPreferredSize().width() / 2, |
| 181 y + throbber_->GetPreferredSize().height() + kSpacing, | 185 y + throbber_->GetPreferredSize().height() + kSpacing, |
| 182 connecting_label_->GetPreferredSize().width(), | 186 connecting_label_->GetPreferredSize().width(), |
| 183 connecting_label_->GetPreferredSize().height()); | 187 connecting_label_->GetPreferredSize().height()); |
| 184 } | 188 } |
| 185 | 189 |
| 186 } // namespace chromeos | 190 } // namespace chromeos |
| OLD | NEW |