| 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 "ash/system/chromeos/network/network_state_notifier.h" | 5 #include "ash/system/chromeos/network/network_state_notifier.h" |
| 6 | 6 |
| 7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
| 8 #include "ash/system/chromeos/network/network_connect.h" | 8 #include "ash/system/chromeos/network/network_connect.h" |
| 9 #include "ash/system/system_notifier.h" | 9 #include "ash/system/system_notifier.h" |
| 10 #include "ash/system/tray/system_tray_delegate.h" | 10 #include "ash/system/tray/system_tray_delegate.h" |
| 11 #include "base/strings/string16.h" | 11 #include "base/strings/string16.h" |
| 12 #include "base/strings/string_util.h" | 12 #include "base/strings/string_util.h" |
| 13 #include "base/strings/utf_string_conversions.h" | 13 #include "base/strings/utf_string_conversions.h" |
| 14 #include "chromeos/network/network_configuration_handler.h" | 14 #include "chromeos/network/network_configuration_handler.h" |
| 15 #include "chromeos/network/network_connection_handler.h" | 15 #include "chromeos/network/network_connection_handler.h" |
| 16 #include "chromeos/network/network_event_log.h" | 16 #include "chromeos/network/network_event_log.h" |
| 17 #include "chromeos/network/network_state.h" | 17 #include "chromeos/network/network_state.h" |
| 18 #include "chromeos/network/network_state_handler.h" | 18 #include "chromeos/network/network_state_handler.h" |
| 19 #include "chromeos/network/shill_property_util.h" | 19 #include "chromeos/network/shill_property_util.h" |
| 20 #include "grit/ash_resources.h" | 20 #include "grit/ash_resources.h" |
| 21 #include "grit/ash_strings.h" | 21 #include "grit/ash_strings.h" |
| 22 #include "grit/ui_chromeos_resources.h" | |
| 23 #include "third_party/cros_system_api/dbus/service_constants.h" | 22 #include "third_party/cros_system_api/dbus/service_constants.h" |
| 24 #include "ui/base/l10n/l10n_util.h" | 23 #include "ui/base/l10n/l10n_util.h" |
| 25 #include "ui/base/resource/resource_bundle.h" | 24 #include "ui/base/resource/resource_bundle.h" |
| 26 #include "ui/message_center/message_center.h" | 25 #include "ui/message_center/message_center.h" |
| 27 #include "ui/message_center/notification.h" | 26 #include "ui/message_center/notification.h" |
| 28 | 27 |
| 29 using chromeos::NetworkConnectionHandler; | 28 using chromeos::NetworkConnectionHandler; |
| 30 using chromeos::NetworkHandler; | 29 using chromeos::NetworkHandler; |
| 31 using chromeos::NetworkState; | 30 using chromeos::NetworkState; |
| 32 using chromeos::NetworkStateHandler; | 31 using chromeos::NetworkStateHandler; |
| (...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 320 | 319 |
| 321 ShowErrorNotification( | 320 ShowErrorNotification( |
| 322 network_connect::kNetworkConnectNotificationId, | 321 network_connect::kNetworkConnectNotificationId, |
| 323 network_type, | 322 network_type, |
| 324 l10n_util::GetStringUTF16(IDS_NETWORK_CONNECTION_ERROR_TITLE), | 323 l10n_util::GetStringUTF16(IDS_NETWORK_CONNECTION_ERROR_TITLE), |
| 325 error_msg, | 324 error_msg, |
| 326 base::Bind(&network_connect::ShowNetworkSettings, service_path)); | 325 base::Bind(&network_connect::ShowNetworkSettings, service_path)); |
| 327 } | 326 } |
| 328 | 327 |
| 329 } // namespace ash | 328 } // namespace ash |
| OLD | NEW |