| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/ui/webui/chromeos/login/error_screen_handler.h" | 5 #include "chrome/browser/ui/webui/chromeos/login/error_screen_handler.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
| 9 #include "base/time/time.h" | 9 #include "base/time/time.h" |
| 10 #include "chrome/browser/chrome_notification_types.h" | 10 #include "chrome/browser/chrome_notification_types.h" |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 LOG(WARNING) << "Offline message is hidden"; | 61 LOG(WARNING) << "Offline message is hidden"; |
| 62 } | 62 } |
| 63 | 63 |
| 64 void ErrorScreenHandler::FixCaptivePortal() { | 64 void ErrorScreenHandler::FixCaptivePortal() { |
| 65 if (!captive_portal_window_proxy_.get()) { | 65 if (!captive_portal_window_proxy_.get()) { |
| 66 content::WebContents* web_contents = | 66 content::WebContents* web_contents = |
| 67 LoginDisplayHostImpl::default_host()->GetWebUILoginView()-> | 67 LoginDisplayHostImpl::default_host()->GetWebUILoginView()-> |
| 68 GetWebContents(); | 68 GetWebContents(); |
| 69 captive_portal_window_proxy_.reset( | 69 captive_portal_window_proxy_.reset( |
| 70 new CaptivePortalWindowProxy(network_state_informer_.get(), | 70 new CaptivePortalWindowProxy(network_state_informer_.get(), |
| 71 GetNativeWindow(), | |
| 72 web_contents)); | 71 web_contents)); |
| 73 } | 72 } |
| 74 captive_portal_window_proxy_->ShowIfRedirected(); | 73 captive_portal_window_proxy_->ShowIfRedirected(); |
| 75 } | 74 } |
| 76 | 75 |
| 77 void ErrorScreenHandler::ShowCaptivePortal() { | 76 void ErrorScreenHandler::ShowCaptivePortal() { |
| 78 // This call is an explicit user action | 77 // This call is an explicit user action |
| 79 // i.e. clicking on link so force dialog show. | 78 // i.e. clicking on link so force dialog show. |
| 80 FixCaptivePortal(); | 79 FixCaptivePortal(); |
| 81 captive_portal_window_proxy_->Show(); | 80 captive_portal_window_proxy_->Show(); |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 180 params.SetInteger("errorState", static_cast<int>(error_state_)); | 179 params.SetInteger("errorState", static_cast<int>(error_state_)); |
| 181 params.SetString("network", network_); | 180 params.SetString("network", network_); |
| 182 params.SetBoolean("guestSigninAllowed", guest_signin_allowed_); | 181 params.SetBoolean("guestSigninAllowed", guest_signin_allowed_); |
| 183 params.SetBoolean("offlineLoginAllowed", offline_login_allowed_); | 182 params.SetBoolean("offlineLoginAllowed", offline_login_allowed_); |
| 184 Show(parent_screen_, ¶ms); | 183 Show(parent_screen_, ¶ms); |
| 185 show_on_init_ = false; | 184 show_on_init_ = false; |
| 186 } | 185 } |
| 187 } | 186 } |
| 188 | 187 |
| 189 } // namespace chromeos | 188 } // namespace chromeos |
| OLD | NEW |