OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "apps/shell/browser/shell_network_controller_chromeos.h" | 5 #include "apps/shell/browser/shell_network_controller_chromeos.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/location.h" | 8 #include "base/location.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/strings/stringprintf.h" | 10 #include "base/strings/stringprintf.h" |
11 #include "base/time/time.h" | 11 #include "base/time/time.h" |
12 #include "chromeos/network/network_connection_handler.h" | 12 #include "chromeos/network/network_connection_handler.h" |
13 #include "chromeos/network/network_handler.h" | 13 #include "chromeos/network/network_handler.h" |
14 #include "chromeos/network/network_handler_callbacks.h" | 14 #include "chromeos/network/network_handler_callbacks.h" |
15 #include "chromeos/network/network_state.h" | 15 #include "chromeos/network/network_state.h" |
16 #include "chromeos/network/network_state_handler.h" | 16 #include "chromeos/network/network_state_handler.h" |
17 #include "chromeos/network/shill_property_util.h" | |
18 #include "third_party/cros_system_api/dbus/service_constants.h" | 17 #include "third_party/cros_system_api/dbus/service_constants.h" |
19 | 18 |
20 namespace apps { | 19 namespace apps { |
21 | 20 |
22 namespace { | 21 namespace { |
23 | 22 |
24 // Frequency at which networks should be scanned when not connected. | 23 // Frequency at which networks should be scanned when not connected. |
25 const int kScanIntervalSec = 10; | 24 const int kScanIntervalSec = 10; |
26 | 25 |
27 void HandleEnableWifiError( | 26 void HandleEnableWifiError( |
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
159 } | 158 } |
160 | 159 |
161 void ShellNetworkController::HandleConnectionError( | 160 void ShellNetworkController::HandleConnectionError( |
162 const std::string& error_name, | 161 const std::string& error_name, |
163 scoped_ptr<base::DictionaryValue> error_data) { | 162 scoped_ptr<base::DictionaryValue> error_data) { |
164 LOG(WARNING) << "Unable to connect to network: " << error_name; | 163 LOG(WARNING) << "Unable to connect to network: " << error_name; |
165 waiting_for_connection_result_ = false; | 164 waiting_for_connection_result_ = false; |
166 } | 165 } |
167 | 166 |
168 } // namespace apps | 167 } // namespace apps |
OLD | NEW |