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/chromeos/login/screens/network_screen.h" | 5 #include "chrome/browser/chromeos/login/screens/network_screen.h" |
6 | 6 |
7 #include "base/location.h" | 7 #include "base/location.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/strings/string16.h" | 9 #include "base/strings/string16.h" |
10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
11 #include "chrome/browser/chromeos/login/help_app_launcher.h" | 11 #include "chrome/browser/chromeos/login/help_app_launcher.h" |
12 #include "chrome/browser/chromeos/login/helper.h" | 12 #include "chrome/browser/chromeos/login/helper.h" |
13 #include "chrome/browser/chromeos/login/login_utils.h" | 13 #include "chrome/browser/chromeos/login/login_utils.h" |
14 #include "chrome/browser/chromeos/login/screens/screen_observer.h" | 14 #include "chrome/browser/chromeos/login/screens/screen_observer.h" |
15 #include "chrome/browser/chromeos/login/wizard_controller.h" | 15 #include "chrome/browser/chromeos/login/wizard_controller.h" |
| 16 #include "chrome/grit/chromium_strings.h" |
| 17 #include "chrome/grit/generated_resources.h" |
| 18 #include "chrome/grit/theme_resources.h" |
16 #include "chromeos/network/network_handler.h" | 19 #include "chromeos/network/network_handler.h" |
17 #include "chromeos/network/network_state_handler.h" | 20 #include "chromeos/network/network_state_handler.h" |
18 #include "grit/chromium_strings.h" | |
19 #include "grit/generated_resources.h" | |
20 #include "grit/theme_resources.h" | |
21 #include "ui/base/l10n/l10n_util.h" | 21 #include "ui/base/l10n/l10n_util.h" |
22 | 22 |
23 namespace { | 23 namespace { |
24 | 24 |
25 // Time in seconds for connection timeout. | 25 // Time in seconds for connection timeout. |
26 const int kConnectionTimeoutSec = 40; | 26 const int kConnectionTimeoutSec = 40; |
27 | 27 |
28 } // namespace | 28 } // namespace |
29 | 29 |
30 namespace chromeos { | 30 namespace chromeos { |
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
198 } | 198 } |
199 | 199 |
200 network_id_ = network_id; | 200 network_id_ = network_id; |
201 if (actor_) { | 201 if (actor_) { |
202 actor_->ShowConnectingStatus(continue_pressed_, network_id_); | 202 actor_->ShowConnectingStatus(continue_pressed_, network_id_); |
203 actor_->EnableContinue(false); | 203 actor_->EnableContinue(false); |
204 } | 204 } |
205 } | 205 } |
206 | 206 |
207 } // namespace chromeos | 207 } // namespace chromeos |
OLD | NEW |