Chromium Code Reviews| 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 #ifndef ASH_SYSTEM_NETWORK_NETWORK_ICON_H_ | 5 #ifndef ASH_SYSTEM_NETWORK_NETWORK_ICON_H_ |
| 6 #define ASH_SYSTEM_NETWORK_NETWORK_ICON_H_ | 6 #define ASH_SYSTEM_NETWORK_NETWORK_ICON_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "ash/ash_export.h" | 10 #include "ash/ash_export.h" |
| (...skipping 16 matching lines...) Expand all Loading... | |
| 27 }; | 27 }; |
| 28 | 28 |
| 29 // Gets the image for provided |network|. |network| must not be NULL. | 29 // Gets the image for provided |network|. |network| must not be NULL. |
| 30 // |icon_type| determines the color theme and whether or not to show the VPN | 30 // |icon_type| determines the color theme and whether or not to show the VPN |
| 31 // badge. This caches badged icons per network per |icon_type|. | 31 // badge. This caches badged icons per network per |icon_type|. |
| 32 ASH_EXPORT gfx::ImageSkia GetImageForNetwork( | 32 ASH_EXPORT gfx::ImageSkia GetImageForNetwork( |
| 33 const chromeos::NetworkState* network, | 33 const chromeos::NetworkState* network, |
| 34 IconType icon_type); | 34 IconType icon_type); |
| 35 | 35 |
| 36 // Gets an image for a Wi-Fi network, either full strength or strike-through | 36 // Gets an image for a Wi-Fi network, either full strength or strike-through |
| 37 // based on |connected|. | 37 // based on |enabled|. |
| 38 // TODO(estade): Expose SignalStrengthImageSource and use that instead. | 38 // TODO(estade): Expose SignalStrengthImageSource and use that instead. |
| 39 ASH_EXPORT gfx::ImageSkia GetBasicImageForWiFiNetwork(bool connected); | 39 ASH_EXPORT gfx::ImageSkia GetImageForWiFiChipState( |
|
stevenjb
2017/04/17 16:22:52
It is unclear to me what 'ChipState' means. Maybe
Evan Stade
2017/04/17 16:29:33
Done.
| |
| 40 bool enabled, | |
| 41 IconType = ICON_TYPE_DEFAULT_VIEW); | |
|
stevenjb
2017/04/17 16:22:52
Mostly we avoid default arguments. I'd just as soo
Evan Stade
2017/04/17 16:29:33
discussed offline, leaving as is.
stevenjb
2017/04/17 16:34:11
Acknowledged.
| |
| 40 | 42 |
| 41 // Gets the disconnected image for a cell network. | 43 // Gets the disconnected image for a cell network. |
| 42 // TODO(estade): Expose SignalStrengthImageSource and use that instead. | 44 // TODO(estade): Expose SignalStrengthImageSource and use that instead. |
| 43 ASH_EXPORT gfx::ImageSkia GetImageForDisconnectedCellNetwork(); | 45 ASH_EXPORT gfx::ImageSkia GetImageForDisconnectedCellNetwork(); |
| 44 | 46 |
| 45 // Gets the full strength image for a Wi-Fi network using |icon_color| for the | 47 // Gets the full strength image for a Wi-Fi network using |icon_color| for the |
| 46 // main icon and |badge_color| for the badge. | 48 // main icon and |badge_color| for the badge. |
| 47 ASH_EXPORT gfx::ImageSkia GetImageForNewWifiNetwork(SkColor icon_color, | 49 ASH_EXPORT gfx::ImageSkia GetImageForNewWifiNetwork(SkColor icon_color, |
| 48 SkColor badge_color); | 50 SkColor badge_color); |
| 49 | 51 |
| (...skipping 16 matching lines...) Expand all Loading... | |
| 66 | 68 |
| 67 // Called when the list of networks changes. Retreives the list of networks | 69 // Called when the list of networks changes. Retreives the list of networks |
| 68 // from the global NetworkStateHandler instance and removes cached entries | 70 // from the global NetworkStateHandler instance and removes cached entries |
| 69 // that are no longer in the list. | 71 // that are no longer in the list. |
| 70 ASH_EXPORT void PurgeNetworkIconCache(); | 72 ASH_EXPORT void PurgeNetworkIconCache(); |
| 71 | 73 |
| 72 } // namespace network_icon | 74 } // namespace network_icon |
| 73 } // namespace ash | 75 } // namespace ash |
| 74 | 76 |
| 75 #endif // ASH_SYSTEM_NETWORK_NETWORK_ICON_H_ | 77 #endif // ASH_SYSTEM_NETWORK_NETWORK_ICON_H_ |
| OLD | NEW |