| 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 "chromeos/network/network_state_handler.h" | 5 #include "chromeos/network/network_state_handler.h" |
| 6 | 6 |
| 7 #include "base/format_macros.h" | 7 #include "base/format_macros.h" |
| 8 #include "base/stl_util.h" | 8 #include "base/stl_util.h" |
| 9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
| 10 #include "base/stringprintf.h" | 10 #include "base/stringprintf.h" |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 } | 50 } |
| 51 | 51 |
| 52 std::string ValueAsString(const base::Value& value) { | 52 std::string ValueAsString(const base::Value& value) { |
| 53 if (value.GetType() == base::Value::TYPE_BOOLEAN) { | 53 if (value.GetType() == base::Value::TYPE_BOOLEAN) { |
| 54 bool bval = false; | 54 bool bval = false; |
| 55 value.GetAsBoolean(&bval); | 55 value.GetAsBoolean(&bval); |
| 56 return bval ? "true" : "false"; | 56 return bval ? "true" : "false"; |
| 57 } else if (value.GetType() == base::Value::TYPE_INTEGER) { | 57 } else if (value.GetType() == base::Value::TYPE_INTEGER) { |
| 58 int intval = 0; | 58 int intval = 0; |
| 59 value.GetAsInteger(&intval); | 59 value.GetAsInteger(&intval); |
| 60 return StringPrintf("%d", intval); | 60 return base::StringPrintf("%d", intval); |
| 61 } else if (value.GetType() == base::Value::TYPE_DOUBLE) { | 61 } else if (value.GetType() == base::Value::TYPE_DOUBLE) { |
| 62 double dval = 0; | 62 double dval = 0; |
| 63 value.GetAsDouble(&dval); | 63 value.GetAsDouble(&dval); |
| 64 return StringPrintf("%g", dval); | 64 return base::StringPrintf("%g", dval); |
| 65 } else if (value.GetType() == base::Value::TYPE_STRING) { | 65 } else if (value.GetType() == base::Value::TYPE_STRING) { |
| 66 std::string vstr; | 66 std::string vstr; |
| 67 value.GetAsString(&vstr); | 67 value.GetAsString(&vstr); |
| 68 return vstr; | 68 return vstr; |
| 69 } | 69 } |
| 70 return ""; | 70 return ""; |
| 71 } | 71 } |
| 72 | 72 |
| 73 } // namespace | 73 } // namespace |
| 74 | 74 |
| (...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 373 if (network_property_updated) { | 373 if (network_property_updated) { |
| 374 NetworkState* network = managed->AsNetworkState(); | 374 NetworkState* network = managed->AsNetworkState(); |
| 375 DCHECK(network); | 375 DCHECK(network); |
| 376 // Signal connection state changed after all properties have been updated. | 376 // Signal connection state changed after all properties have been updated. |
| 377 if (network->connection_state() != prev_connection_state) | 377 if (network->connection_state() != prev_connection_state) |
| 378 OnNetworkConnectionStateChanged(network); | 378 OnNetworkConnectionStateChanged(network); |
| 379 NetworkPropertiesUpdated(network); | 379 NetworkPropertiesUpdated(network); |
| 380 } | 380 } |
| 381 network_event_log::AddEntry( | 381 network_event_log::AddEntry( |
| 382 kLogModule, "PropertiesReceived", | 382 kLogModule, "PropertiesReceived", |
| 383 StringPrintf("%s (%s)", path.c_str(), managed->name().c_str())); | 383 base::StringPrintf("%s (%s)", path.c_str(), managed->name().c_str())); |
| 384 } | 384 } |
| 385 | 385 |
| 386 void NetworkStateHandler::UpdateNetworkServiceProperty( | 386 void NetworkStateHandler::UpdateNetworkServiceProperty( |
| 387 const std::string& service_path, | 387 const std::string& service_path, |
| 388 const std::string& key, | 388 const std::string& key, |
| 389 const base::Value& value) { | 389 const base::Value& value) { |
| 390 NetworkState* network = GetModifiableNetworkState(service_path); | 390 NetworkState* network = GetModifiableNetworkState(service_path); |
| 391 if (!network) | 391 if (!network) |
| 392 return; | 392 return; |
| 393 std::string prev_connection_state = network->connection_state(); | 393 std::string prev_connection_state = network->connection_state(); |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 440 FOR_EACH_OBSERVER(NetworkStateHandlerObserver, observers_, | 440 FOR_EACH_OBSERVER(NetworkStateHandlerObserver, observers_, |
| 441 NetworkManagerChanged()); | 441 NetworkManagerChanged()); |
| 442 } | 442 } |
| 443 | 443 |
| 444 void NetworkStateHandler::ManagedStateListChanged( | 444 void NetworkStateHandler::ManagedStateListChanged( |
| 445 ManagedState::ManagedType type) { | 445 ManagedState::ManagedType type) { |
| 446 if (type == ManagedState::MANAGED_TYPE_NETWORK) { | 446 if (type == ManagedState::MANAGED_TYPE_NETWORK) { |
| 447 // Notify observers that the list of networks has changed. | 447 // Notify observers that the list of networks has changed. |
| 448 network_event_log::AddEntry( | 448 network_event_log::AddEntry( |
| 449 kLogModule, "NetworkListChanged", | 449 kLogModule, "NetworkListChanged", |
| 450 StringPrintf("Size: %"PRIuS, network_list_.size())); | 450 base::StringPrintf("Size: %"PRIuS, network_list_.size())); |
| 451 FOR_EACH_OBSERVER(NetworkStateHandlerObserver, observers_, | 451 FOR_EACH_OBSERVER(NetworkStateHandlerObserver, observers_, |
| 452 NetworkListChanged()); | 452 NetworkListChanged()); |
| 453 // The list order may have changed, so check if the default network changed. | 453 // The list order may have changed, so check if the default network changed. |
| 454 if (CheckDefaultNetworkChanged()) | 454 if (CheckDefaultNetworkChanged()) |
| 455 OnDefaultNetworkChanged(); | 455 OnDefaultNetworkChanged(); |
| 456 } else if (type == ManagedState::MANAGED_TYPE_DEVICE) { | 456 } else if (type == ManagedState::MANAGED_TYPE_DEVICE) { |
| 457 network_event_log::AddEntry( | 457 network_event_log::AddEntry( |
| 458 kLogModule, "DeviceListChanged", | 458 kLogModule, "DeviceListChanged", |
| 459 StringPrintf("Size: %"PRIuS, device_list_.size())); | 459 base::StringPrintf("Size: %"PRIuS, device_list_.size())); |
| 460 FOR_EACH_OBSERVER(NetworkStateHandlerObserver, observers_, | 460 FOR_EACH_OBSERVER(NetworkStateHandlerObserver, observers_, |
| 461 DeviceListChanged()); | 461 DeviceListChanged()); |
| 462 } else { | 462 } else { |
| 463 NOTREACHED(); | 463 NOTREACHED(); |
| 464 } | 464 } |
| 465 } | 465 } |
| 466 | 466 |
| 467 //------------------------------------------------------------------------------ | 467 //------------------------------------------------------------------------------ |
| 468 // Private methods | 468 // Private methods |
| 469 | 469 |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 504 case ManagedState::MANAGED_TYPE_DEVICE: | 504 case ManagedState::MANAGED_TYPE_DEVICE: |
| 505 return &device_list_; | 505 return &device_list_; |
| 506 } | 506 } |
| 507 NOTREACHED(); | 507 NOTREACHED(); |
| 508 return NULL; | 508 return NULL; |
| 509 } | 509 } |
| 510 | 510 |
| 511 void NetworkStateHandler::OnNetworkConnectionStateChanged( | 511 void NetworkStateHandler::OnNetworkConnectionStateChanged( |
| 512 NetworkState* network) { | 512 NetworkState* network) { |
| 513 DCHECK(network); | 513 DCHECK(network); |
| 514 std::string desc = StringPrintf( | 514 std::string desc = base::StringPrintf( |
| 515 "%s: %s", network->path().c_str(), network->connection_state().c_str()); | 515 "%s: %s", network->path().c_str(), network->connection_state().c_str()); |
| 516 network_event_log::AddEntry( | 516 network_event_log::AddEntry( |
| 517 kLogModule, "NetworkConnectionStateChanged", desc); | 517 kLogModule, "NetworkConnectionStateChanged", desc); |
| 518 FOR_EACH_OBSERVER(NetworkStateHandlerObserver, observers_, | 518 FOR_EACH_OBSERVER(NetworkStateHandlerObserver, observers_, |
| 519 NetworkConnectionStateChanged(network)); | 519 NetworkConnectionStateChanged(network)); |
| 520 if (CheckDefaultNetworkChanged() || network->path() == default_network_path_) | 520 if (CheckDefaultNetworkChanged() || network->path() == default_network_path_) |
| 521 OnDefaultNetworkChanged(); | 521 OnDefaultNetworkChanged(); |
| 522 } | 522 } |
| 523 | 523 |
| 524 bool NetworkStateHandler::CheckDefaultNetworkChanged() { | 524 bool NetworkStateHandler::CheckDefaultNetworkChanged() { |
| (...skipping 18 matching lines...) Expand all Loading... |
| 543 | 543 |
| 544 void NetworkStateHandler::NetworkPropertiesUpdated( | 544 void NetworkStateHandler::NetworkPropertiesUpdated( |
| 545 const NetworkState* network) { | 545 const NetworkState* network) { |
| 546 if (network->path() == connecting_network_ && !network->IsConnectingState()) | 546 if (network->path() == connecting_network_ && !network->IsConnectingState()) |
| 547 connecting_network_.clear(); | 547 connecting_network_.clear(); |
| 548 FOR_EACH_OBSERVER(NetworkStateHandlerObserver, observers_, | 548 FOR_EACH_OBSERVER(NetworkStateHandlerObserver, observers_, |
| 549 NetworkPropertiesUpdated(network)); | 549 NetworkPropertiesUpdated(network)); |
| 550 } | 550 } |
| 551 | 551 |
| 552 } // namespace chromeos | 552 } // namespace chromeos |
| OLD | NEW |