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.h" | 8 #include "base/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/chromeos/login/captive_portal_window_proxy.h" | 11 #include "chrome/browser/chromeos/login/captive_portal_window_proxy.h" |
11 #include "chrome/browser/chromeos/net/network_portal_detector.h" | 12 #include "chrome/browser/chromeos/net/network_portal_detector.h" |
12 #include "chrome/browser/ui/webui/chromeos/login/native_window_delegate.h" | 13 #include "chrome/browser/ui/webui/chromeos/login/native_window_delegate.h" |
13 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h" | 14 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h" |
14 #include "chrome/common/chrome_notification_types.h" | |
15 #include "grit/generated_resources.h" | 15 #include "grit/generated_resources.h" |
16 | 16 |
17 namespace chromeos { | 17 namespace chromeos { |
18 | 18 |
19 namespace { | 19 namespace { |
20 | 20 |
21 void EnableLazyDetection() { | 21 void EnableLazyDetection() { |
22 NetworkPortalDetector* detector = NetworkPortalDetector::GetInstance(); | 22 NetworkPortalDetector* detector = NetworkPortalDetector::GetInstance(); |
23 if (NetworkPortalDetector::IsEnabledInCommandLine() && detector) | 23 if (NetworkPortalDetector::IsEnabledInCommandLine() && detector) |
24 detector->EnableLazyDetection(); | 24 detector->EnableLazyDetection(); |
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
154 void ErrorScreenHandler::Initialize() { | 154 void ErrorScreenHandler::Initialize() { |
155 if (!page_is_ready()) | 155 if (!page_is_ready()) |
156 return; | 156 return; |
157 if (show_on_init_) { | 157 if (show_on_init_) { |
158 Show(parent_screen_, NULL); | 158 Show(parent_screen_, NULL); |
159 show_on_init_ = false; | 159 show_on_init_ = false; |
160 } | 160 } |
161 } | 161 } |
162 | 162 |
163 } // namespace chromeos | 163 } // namespace chromeos |
OLD | NEW |