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_icon.h" | 5 #include "ash/system/chromeos/network/network_icon.h" |
6 | 6 |
7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
8 #include "ash/system/chromeos/network/network_icon_animation.h" | 8 #include "ash/system/chromeos/network/network_icon_animation.h" |
9 #include "ash/system/chromeos/network/network_icon_animation_observer.h" | 9 #include "ash/system/chromeos/network/network_icon_animation_observer.h" |
10 #include "base/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
11 #include "chromeos/network/device_state.h" | 11 #include "chromeos/network/device_state.h" |
12 #include "chromeos/network/network_connection_handler.h" | 12 #include "chromeos/network/network_connection_handler.h" |
13 #include "chromeos/network/network_state.h" | 13 #include "chromeos/network/network_state.h" |
14 #include "chromeos/network/network_state_handler.h" | 14 #include "chromeos/network/network_state_handler.h" |
15 #include "grit/ash_resources.h" | 15 #include "grit/ash_resources.h" |
16 #include "grit/ash_strings.h" | 16 #include "grit/ash_strings.h" |
17 #include "third_party/cros_system_api/dbus/service_constants.h" | 17 #include "third_party/cros_system_api/dbus/service_constants.h" |
18 #include "ui/base/l10n/l10n_util.h" | 18 #include "ui/base/l10n/l10n_util.h" |
19 #include "ui/base/resource/resource_bundle.h" | 19 #include "ui/base/resource/resource_bundle.h" |
20 #include "ui/gfx/canvas.h" | 20 #include "ui/gfx/canvas.h" |
(...skipping 781 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
802 } | 802 } |
803 *animating = network->IsConnectingState(); | 803 *animating = network->IsConnectingState(); |
804 // Get icon and label for connected or connecting network. | 804 // Get icon and label for connected or connecting network. |
805 *image = GetImageForNetwork(network, icon_type); | 805 *image = GetImageForNetwork(network, icon_type); |
806 if (label) | 806 if (label) |
807 *label = GetLabelForNetwork(network, icon_type); | 807 *label = GetLabelForNetwork(network, icon_type); |
808 } | 808 } |
809 | 809 |
810 } // namespace network_icon | 810 } // namespace network_icon |
811 } // namespace ash | 811 } // namespace ash |
OLD | NEW |