diff --git a/ash/ash.gyp b/ash/ash.gyp index f2d065a56e1ce5..9976671232235e 100644 --- a/ash/ash.gyp +++ b/ash/ash.gyp @@ -26,9 +26,6 @@ '../ui/app_list/app_list.gyp:app_list', '../ui/aura/aura.gyp:aura', '../ui/base/ui_base.gyp:ui_base', - '../ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources', - '../ui/chromeos/ui_chromeos.gyp:ui_chromeos_strings', - '../ui/chromeos/ui_chromeos.gyp:ui_chromeos', '../ui/compositor/compositor.gyp:compositor', '../ui/events/events.gyp:events', '../ui/events/events.gyp:events_base', @@ -334,6 +331,11 @@ 'system/chromeos/network/network_connect.cc', 'system/chromeos/network/network_connect.h', 'system/chromeos/network/network_detailed_view.h', + 'system/chromeos/network/network_icon.cc', + 'system/chromeos/network/network_icon.h', + 'system/chromeos/network/network_icon_animation.cc', + 'system/chromeos/network/network_icon_animation.h', + 'system/chromeos/network/network_icon_animation_observer.h', 'system/chromeos/network/network_observer.h', 'system/chromeos/network/network_portal_detector_observer.h', 'system/chromeos/network/network_state_list_detailed_view.cc', diff --git a/ash/ash_chromeos_strings.grdp b/ash/ash_chromeos_strings.grdp index 4a895fa70340d2..2fd30fb48e590e 100644 --- a/ash/ash_chromeos_strings.grdp +++ b/ash/ash_chromeos_strings.grdp @@ -25,6 +25,9 @@ Private Network + + Ethernet + Wi-Fi @@ -43,9 +46,30 @@ No cellular network available + + No network + VPN disconnected + + Connected to $1GoogleGuest + + + Connecting to $1GoogleGuest + + + Activating $1YBH Cellular + + + $1GoogleGuest: Connecting... + + + $1YBH Cellular: Activating... + + + Activate $1YBH Cellular + Settings... @@ -94,6 +118,12 @@ Searching for Wi-Fi networks... + + Initializing cellular modem... + + + Searching for cellular networks... + Your computer is discoverable to nearby Bluetooth devices and will appear as "$1Chromebook" with address $201:23:45:67:89:0A diff --git a/ash/resources/ash_resources.grd b/ash/resources/ash_resources.grd index 56271ca5288e58..4f0be18f6f14bd 100644 --- a/ash/resources/ash_resources.grd +++ b/ash/resources/ash_resources.grd @@ -145,8 +145,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui/chromeos/resources/default_100_percent/network/status_network_failed.png b/ash/resources/default_100_percent/cros/network/status_network_failed.png similarity index 100% rename from ui/chromeos/resources/default_100_percent/network/status_network_failed.png rename to ash/resources/default_100_percent/cros/network/status_network_failed.png diff --git a/ui/chromeos/resources/default_100_percent/network/statusbar_network_1x.png b/ash/resources/default_100_percent/cros/network/statusbar_network_1x.png similarity index 100% rename from ui/chromeos/resources/default_100_percent/network/statusbar_network_1x.png rename to ash/resources/default_100_percent/cros/network/statusbar_network_1x.png diff --git a/ui/chromeos/resources/default_100_percent/network/statusbar_network_3g_dark.png b/ash/resources/default_100_percent/cros/network/statusbar_network_3g_dark.png similarity index 100% rename from ui/chromeos/resources/default_100_percent/network/statusbar_network_3g_dark.png rename to ash/resources/default_100_percent/cros/network/statusbar_network_3g_dark.png diff --git a/ui/chromeos/resources/default_100_percent/network/statusbar_network_3g_light.png b/ash/resources/default_100_percent/cros/network/statusbar_network_3g_light.png similarity index 100% rename from ui/chromeos/resources/default_100_percent/network/statusbar_network_3g_light.png rename to ash/resources/default_100_percent/cros/network/statusbar_network_3g_light.png diff --git a/ui/chromeos/resources/default_100_percent/network/statusbar_network_4g_dark.png b/ash/resources/default_100_percent/cros/network/statusbar_network_4g_dark.png similarity index 100% rename from ui/chromeos/resources/default_100_percent/network/statusbar_network_4g_dark.png rename to ash/resources/default_100_percent/cros/network/statusbar_network_4g_dark.png diff --git a/ui/chromeos/resources/default_100_percent/network/statusbar_network_4g_light.png b/ash/resources/default_100_percent/cros/network/statusbar_network_4g_light.png similarity index 100% rename from ui/chromeos/resources/default_100_percent/network/statusbar_network_4g_light.png rename to ash/resources/default_100_percent/cros/network/statusbar_network_4g_light.png diff --git a/ui/chromeos/resources/default_100_percent/network/statusbar_network_active_portal_dark.png b/ash/resources/default_100_percent/cros/network/statusbar_network_active_portal_dark.png similarity index 100% rename from ui/chromeos/resources/default_100_percent/network/statusbar_network_active_portal_dark.png rename to ash/resources/default_100_percent/cros/network/statusbar_network_active_portal_dark.png diff --git a/ui/chromeos/resources/default_100_percent/network/statusbar_network_active_portal_light.png b/ash/resources/default_100_percent/cros/network/statusbar_network_active_portal_light.png similarity index 100% rename from ui/chromeos/resources/default_100_percent/network/statusbar_network_active_portal_light.png rename to ash/resources/default_100_percent/cros/network/statusbar_network_active_portal_light.png diff --git a/ui/chromeos/resources/default_100_percent/network/statusbar_network_arcs_dark.png b/ash/resources/default_100_percent/cros/network/statusbar_network_arcs_dark.png similarity index 100% rename from ui/chromeos/resources/default_100_percent/network/statusbar_network_arcs_dark.png rename to ash/resources/default_100_percent/cros/network/statusbar_network_arcs_dark.png diff --git a/ui/chromeos/resources/default_100_percent/network/statusbar_network_arcs_light.png b/ash/resources/default_100_percent/cros/network/statusbar_network_arcs_light.png similarity index 100% rename from ui/chromeos/resources/default_100_percent/network/statusbar_network_arcs_light.png rename to ash/resources/default_100_percent/cros/network/statusbar_network_arcs_light.png diff --git a/ui/chromeos/resources/default_100_percent/network/statusbar_network_bars_dark.png b/ash/resources/default_100_percent/cros/network/statusbar_network_bars_dark.png similarity index 100% rename from ui/chromeos/resources/default_100_percent/network/statusbar_network_bars_dark.png rename to ash/resources/default_100_percent/cros/network/statusbar_network_bars_dark.png diff --git a/ui/chromeos/resources/default_100_percent/network/statusbar_network_bars_light.png b/ash/resources/default_100_percent/cros/network/statusbar_network_bars_light.png similarity index 100% rename from ui/chromeos/resources/default_100_percent/network/statusbar_network_bars_light.png rename to ash/resources/default_100_percent/cros/network/statusbar_network_bars_light.png diff --git a/ui/chromeos/resources/default_100_percent/network/statusbar_network_edge_dark.png b/ash/resources/default_100_percent/cros/network/statusbar_network_edge_dark.png similarity index 100% rename from ui/chromeos/resources/default_100_percent/network/statusbar_network_edge_dark.png rename to ash/resources/default_100_percent/cros/network/statusbar_network_edge_dark.png diff --git a/ui/chromeos/resources/default_100_percent/network/statusbar_network_edge_light.png b/ash/resources/default_100_percent/cros/network/statusbar_network_edge_light.png similarity index 100% rename from ui/chromeos/resources/default_100_percent/network/statusbar_network_edge_light.png rename to ash/resources/default_100_percent/cros/network/statusbar_network_edge_light.png diff --git a/ui/chromeos/resources/default_100_percent/network/statusbar_network_evdo_dark.png b/ash/resources/default_100_percent/cros/network/statusbar_network_evdo_dark.png similarity index 100% rename from ui/chromeos/resources/default_100_percent/network/statusbar_network_evdo_dark.png rename to ash/resources/default_100_percent/cros/network/statusbar_network_evdo_dark.png diff --git a/ui/chromeos/resources/default_100_percent/network/statusbar_network_evdo_light.png b/ash/resources/default_100_percent/cros/network/statusbar_network_evdo_light.png similarity index 100% rename from ui/chromeos/resources/default_100_percent/network/statusbar_network_evdo_light.png rename to ash/resources/default_100_percent/cros/network/statusbar_network_evdo_light.png diff --git a/ui/chromeos/resources/default_100_percent/network/statusbar_network_gprs_dark.png b/ash/resources/default_100_percent/cros/network/statusbar_network_gprs_dark.png similarity index 100% rename from ui/chromeos/resources/default_100_percent/network/statusbar_network_gprs_dark.png rename to ash/resources/default_100_percent/cros/network/statusbar_network_gprs_dark.png diff --git a/ui/chromeos/resources/default_100_percent/network/statusbar_network_gprs_light.png b/ash/resources/default_100_percent/cros/network/statusbar_network_gprs_light.png similarity index 100% rename from ui/chromeos/resources/default_100_percent/network/statusbar_network_gprs_light.png rename to ash/resources/default_100_percent/cros/network/statusbar_network_gprs_light.png diff --git a/ui/chromeos/resources/default_100_percent/network/statusbar_network_hspa_dark.png b/ash/resources/default_100_percent/cros/network/statusbar_network_hspa_dark.png similarity index 100% rename from ui/chromeos/resources/default_100_percent/network/statusbar_network_hspa_dark.png rename to ash/resources/default_100_percent/cros/network/statusbar_network_hspa_dark.png diff --git a/ui/chromeos/resources/default_100_percent/network/statusbar_network_hspa_light.png b/ash/resources/default_100_percent/cros/network/statusbar_network_hspa_light.png similarity index 100% rename from ui/chromeos/resources/default_100_percent/network/statusbar_network_hspa_light.png rename to ash/resources/default_100_percent/cros/network/statusbar_network_hspa_light.png diff --git a/ui/chromeos/resources/default_100_percent/network/statusbar_network_hspa_plus_dark.png b/ash/resources/default_100_percent/cros/network/statusbar_network_hspa_plus_dark.png similarity index 100% rename from ui/chromeos/resources/default_100_percent/network/statusbar_network_hspa_plus_dark.png rename to ash/resources/default_100_percent/cros/network/statusbar_network_hspa_plus_dark.png diff --git a/ui/chromeos/resources/default_100_percent/network/statusbar_network_hspa_plus_light.png b/ash/resources/default_100_percent/cros/network/statusbar_network_hspa_plus_light.png similarity index 100% rename from ui/chromeos/resources/default_100_percent/network/statusbar_network_hspa_plus_light.png rename to ash/resources/default_100_percent/cros/network/statusbar_network_hspa_plus_light.png diff --git a/ui/chromeos/resources/default_100_percent/network/statusbar_network_lte_advanced_dark.png b/ash/resources/default_100_percent/cros/network/statusbar_network_lte_advanced_dark.png similarity index 100% rename from ui/chromeos/resources/default_100_percent/network/statusbar_network_lte_advanced_dark.png rename to ash/resources/default_100_percent/cros/network/statusbar_network_lte_advanced_dark.png diff --git a/ui/chromeos/resources/default_100_percent/network/statusbar_network_lte_advanced_light.png b/ash/resources/default_100_percent/cros/network/statusbar_network_lte_advanced_light.png similarity index 100% rename from ui/chromeos/resources/default_100_percent/network/statusbar_network_lte_advanced_light.png rename to ash/resources/default_100_percent/cros/network/statusbar_network_lte_advanced_light.png diff --git a/ui/chromeos/resources/default_100_percent/network/statusbar_network_lte_dark.png b/ash/resources/default_100_percent/cros/network/statusbar_network_lte_dark.png similarity index 100% rename from ui/chromeos/resources/default_100_percent/network/statusbar_network_lte_dark.png rename to ash/resources/default_100_percent/cros/network/statusbar_network_lte_dark.png diff --git a/ui/chromeos/resources/default_100_percent/network/statusbar_network_lte_light.png b/ash/resources/default_100_percent/cros/network/statusbar_network_lte_light.png similarity index 100% rename from ui/chromeos/resources/default_100_percent/network/statusbar_network_lte_light.png rename to ash/resources/default_100_percent/cros/network/statusbar_network_lte_light.png diff --git a/ui/chromeos/resources/default_100_percent/network/statusbar_network_roaming_dark.png b/ash/resources/default_100_percent/cros/network/statusbar_network_roaming_dark.png similarity index 100% rename from ui/chromeos/resources/default_100_percent/network/statusbar_network_roaming_dark.png rename to ash/resources/default_100_percent/cros/network/statusbar_network_roaming_dark.png diff --git a/ui/chromeos/resources/default_100_percent/network/statusbar_network_roaming_light.png b/ash/resources/default_100_percent/cros/network/statusbar_network_roaming_light.png similarity index 100% rename from ui/chromeos/resources/default_100_percent/network/statusbar_network_roaming_light.png rename to ash/resources/default_100_percent/cros/network/statusbar_network_roaming_light.png diff --git a/ui/chromeos/resources/default_100_percent/network/statusbar_network_secure_dark.png b/ash/resources/default_100_percent/cros/network/statusbar_network_secure_dark.png similarity index 100% rename from ui/chromeos/resources/default_100_percent/network/statusbar_network_secure_dark.png rename to ash/resources/default_100_percent/cros/network/statusbar_network_secure_dark.png diff --git a/ui/chromeos/resources/default_100_percent/network/statusbar_network_vpn_badge.png b/ash/resources/default_100_percent/cros/network/statusbar_network_vpn_badge.png similarity index 100% rename from ui/chromeos/resources/default_100_percent/network/statusbar_network_vpn_badge.png rename to ash/resources/default_100_percent/cros/network/statusbar_network_vpn_badge.png diff --git a/ui/chromeos/resources/default_100_percent/network/statusbar_vpn_dark.png b/ash/resources/default_100_percent/cros/network/statusbar_vpn_dark.png similarity index 100% rename from ui/chromeos/resources/default_100_percent/network/statusbar_vpn_dark.png rename to ash/resources/default_100_percent/cros/network/statusbar_vpn_dark.png diff --git a/ui/chromeos/resources/default_100_percent/network/statusbar_wired.png b/ash/resources/default_100_percent/cros/network/statusbar_wired.png similarity index 100% rename from ui/chromeos/resources/default_100_percent/network/statusbar_wired.png rename to ash/resources/default_100_percent/cros/network/statusbar_wired.png diff --git a/ui/chromeos/resources/default_200_percent/network/status_network_failed.png b/ash/resources/default_200_percent/cros/network/status_network_failed.png similarity index 100% rename from ui/chromeos/resources/default_200_percent/network/status_network_failed.png rename to ash/resources/default_200_percent/cros/network/status_network_failed.png diff --git a/ui/chromeos/resources/default_200_percent/network/statusbar_network_3g_dark.png b/ash/resources/default_200_percent/cros/network/statusbar_network_3g_dark.png similarity index 100% rename from ui/chromeos/resources/default_200_percent/network/statusbar_network_3g_dark.png rename to ash/resources/default_200_percent/cros/network/statusbar_network_3g_dark.png diff --git a/ui/chromeos/resources/default_200_percent/network/statusbar_network_3g_light.png b/ash/resources/default_200_percent/cros/network/statusbar_network_3g_light.png similarity index 100% rename from ui/chromeos/resources/default_200_percent/network/statusbar_network_3g_light.png rename to ash/resources/default_200_percent/cros/network/statusbar_network_3g_light.png diff --git a/ui/chromeos/resources/default_200_percent/network/statusbar_network_4g_dark.png b/ash/resources/default_200_percent/cros/network/statusbar_network_4g_dark.png similarity index 100% rename from ui/chromeos/resources/default_200_percent/network/statusbar_network_4g_dark.png rename to ash/resources/default_200_percent/cros/network/statusbar_network_4g_dark.png diff --git a/ui/chromeos/resources/default_200_percent/network/statusbar_network_4g_light.png b/ash/resources/default_200_percent/cros/network/statusbar_network_4g_light.png similarity index 100% rename from ui/chromeos/resources/default_200_percent/network/statusbar_network_4g_light.png rename to ash/resources/default_200_percent/cros/network/statusbar_network_4g_light.png diff --git a/ui/chromeos/resources/default_200_percent/network/statusbar_network_active_portal_dark.png b/ash/resources/default_200_percent/cros/network/statusbar_network_active_portal_dark.png similarity index 100% rename from ui/chromeos/resources/default_200_percent/network/statusbar_network_active_portal_dark.png rename to ash/resources/default_200_percent/cros/network/statusbar_network_active_portal_dark.png diff --git a/ui/chromeos/resources/default_200_percent/network/statusbar_network_active_portal_light.png b/ash/resources/default_200_percent/cros/network/statusbar_network_active_portal_light.png similarity index 100% rename from ui/chromeos/resources/default_200_percent/network/statusbar_network_active_portal_light.png rename to ash/resources/default_200_percent/cros/network/statusbar_network_active_portal_light.png diff --git a/ui/chromeos/resources/default_200_percent/network/statusbar_network_arcs_dark.png b/ash/resources/default_200_percent/cros/network/statusbar_network_arcs_dark.png similarity index 100% rename from ui/chromeos/resources/default_200_percent/network/statusbar_network_arcs_dark.png rename to ash/resources/default_200_percent/cros/network/statusbar_network_arcs_dark.png diff --git a/ui/chromeos/resources/default_200_percent/network/statusbar_network_arcs_light.png b/ash/resources/default_200_percent/cros/network/statusbar_network_arcs_light.png similarity index 100% rename from ui/chromeos/resources/default_200_percent/network/statusbar_network_arcs_light.png rename to ash/resources/default_200_percent/cros/network/statusbar_network_arcs_light.png diff --git a/ui/chromeos/resources/default_200_percent/network/statusbar_network_bars_dark.png b/ash/resources/default_200_percent/cros/network/statusbar_network_bars_dark.png similarity index 100% rename from ui/chromeos/resources/default_200_percent/network/statusbar_network_bars_dark.png rename to ash/resources/default_200_percent/cros/network/statusbar_network_bars_dark.png diff --git a/ui/chromeos/resources/default_200_percent/network/statusbar_network_bars_light.png b/ash/resources/default_200_percent/cros/network/statusbar_network_bars_light.png similarity index 100% rename from ui/chromeos/resources/default_200_percent/network/statusbar_network_bars_light.png rename to ash/resources/default_200_percent/cros/network/statusbar_network_bars_light.png diff --git a/ui/chromeos/resources/default_200_percent/network/statusbar_network_edge_dark.png b/ash/resources/default_200_percent/cros/network/statusbar_network_edge_dark.png similarity index 100% rename from ui/chromeos/resources/default_200_percent/network/statusbar_network_edge_dark.png rename to ash/resources/default_200_percent/cros/network/statusbar_network_edge_dark.png diff --git a/ui/chromeos/resources/default_200_percent/network/statusbar_network_edge_light.png b/ash/resources/default_200_percent/cros/network/statusbar_network_edge_light.png similarity index 100% rename from ui/chromeos/resources/default_200_percent/network/statusbar_network_edge_light.png rename to ash/resources/default_200_percent/cros/network/statusbar_network_edge_light.png diff --git a/ui/chromeos/resources/default_200_percent/network/statusbar_network_evdo_dark.png b/ash/resources/default_200_percent/cros/network/statusbar_network_evdo_dark.png similarity index 100% rename from ui/chromeos/resources/default_200_percent/network/statusbar_network_evdo_dark.png rename to ash/resources/default_200_percent/cros/network/statusbar_network_evdo_dark.png diff --git a/ui/chromeos/resources/default_200_percent/network/statusbar_network_evdo_light.png b/ash/resources/default_200_percent/cros/network/statusbar_network_evdo_light.png similarity index 100% rename from ui/chromeos/resources/default_200_percent/network/statusbar_network_evdo_light.png rename to ash/resources/default_200_percent/cros/network/statusbar_network_evdo_light.png diff --git a/ui/chromeos/resources/default_200_percent/network/statusbar_network_gprs_dark.png b/ash/resources/default_200_percent/cros/network/statusbar_network_gprs_dark.png similarity index 100% rename from ui/chromeos/resources/default_200_percent/network/statusbar_network_gprs_dark.png rename to ash/resources/default_200_percent/cros/network/statusbar_network_gprs_dark.png diff --git a/ui/chromeos/resources/default_200_percent/network/statusbar_network_gprs_light.png b/ash/resources/default_200_percent/cros/network/statusbar_network_gprs_light.png similarity index 100% rename from ui/chromeos/resources/default_200_percent/network/statusbar_network_gprs_light.png rename to ash/resources/default_200_percent/cros/network/statusbar_network_gprs_light.png diff --git a/ui/chromeos/resources/default_200_percent/network/statusbar_network_hspa_dark.png b/ash/resources/default_200_percent/cros/network/statusbar_network_hspa_dark.png similarity index 100% rename from ui/chromeos/resources/default_200_percent/network/statusbar_network_hspa_dark.png rename to ash/resources/default_200_percent/cros/network/statusbar_network_hspa_dark.png diff --git a/ui/chromeos/resources/default_200_percent/network/statusbar_network_hspa_light.png b/ash/resources/default_200_percent/cros/network/statusbar_network_hspa_light.png similarity index 100% rename from ui/chromeos/resources/default_200_percent/network/statusbar_network_hspa_light.png rename to ash/resources/default_200_percent/cros/network/statusbar_network_hspa_light.png diff --git a/ui/chromeos/resources/default_200_percent/network/statusbar_network_hspa_plus_dark.png b/ash/resources/default_200_percent/cros/network/statusbar_network_hspa_plus_dark.png similarity index 100% rename from ui/chromeos/resources/default_200_percent/network/statusbar_network_hspa_plus_dark.png rename to ash/resources/default_200_percent/cros/network/statusbar_network_hspa_plus_dark.png diff --git a/ui/chromeos/resources/default_200_percent/network/statusbar_network_hspa_plus_light.png b/ash/resources/default_200_percent/cros/network/statusbar_network_hspa_plus_light.png similarity index 100% rename from ui/chromeos/resources/default_200_percent/network/statusbar_network_hspa_plus_light.png rename to ash/resources/default_200_percent/cros/network/statusbar_network_hspa_plus_light.png diff --git a/ui/chromeos/resources/default_200_percent/network/statusbar_network_lte_advanced_dark.png b/ash/resources/default_200_percent/cros/network/statusbar_network_lte_advanced_dark.png similarity index 100% rename from ui/chromeos/resources/default_200_percent/network/statusbar_network_lte_advanced_dark.png rename to ash/resources/default_200_percent/cros/network/statusbar_network_lte_advanced_dark.png diff --git a/ui/chromeos/resources/default_200_percent/network/statusbar_network_lte_advanced_light.png b/ash/resources/default_200_percent/cros/network/statusbar_network_lte_advanced_light.png similarity index 100% rename from ui/chromeos/resources/default_200_percent/network/statusbar_network_lte_advanced_light.png rename to ash/resources/default_200_percent/cros/network/statusbar_network_lte_advanced_light.png diff --git a/ui/chromeos/resources/default_200_percent/network/statusbar_network_lte_dark.png b/ash/resources/default_200_percent/cros/network/statusbar_network_lte_dark.png similarity index 100% rename from ui/chromeos/resources/default_200_percent/network/statusbar_network_lte_dark.png rename to ash/resources/default_200_percent/cros/network/statusbar_network_lte_dark.png diff --git a/ui/chromeos/resources/default_200_percent/network/statusbar_network_lte_light.png b/ash/resources/default_200_percent/cros/network/statusbar_network_lte_light.png similarity index 100% rename from ui/chromeos/resources/default_200_percent/network/statusbar_network_lte_light.png rename to ash/resources/default_200_percent/cros/network/statusbar_network_lte_light.png diff --git a/ui/chromeos/resources/default_200_percent/network/statusbar_network_roaming_dark.png b/ash/resources/default_200_percent/cros/network/statusbar_network_roaming_dark.png similarity index 100% rename from ui/chromeos/resources/default_200_percent/network/statusbar_network_roaming_dark.png rename to ash/resources/default_200_percent/cros/network/statusbar_network_roaming_dark.png diff --git a/ui/chromeos/resources/default_200_percent/network/statusbar_network_roaming_light.png b/ash/resources/default_200_percent/cros/network/statusbar_network_roaming_light.png similarity index 100% rename from ui/chromeos/resources/default_200_percent/network/statusbar_network_roaming_light.png rename to ash/resources/default_200_percent/cros/network/statusbar_network_roaming_light.png diff --git a/ui/chromeos/resources/default_200_percent/network/statusbar_network_secure_dark.png b/ash/resources/default_200_percent/cros/network/statusbar_network_secure_dark.png similarity index 100% rename from ui/chromeos/resources/default_200_percent/network/statusbar_network_secure_dark.png rename to ash/resources/default_200_percent/cros/network/statusbar_network_secure_dark.png diff --git a/ui/chromeos/resources/default_200_percent/network/statusbar_network_vpn_badge.png b/ash/resources/default_200_percent/cros/network/statusbar_network_vpn_badge.png similarity index 100% rename from ui/chromeos/resources/default_200_percent/network/statusbar_network_vpn_badge.png rename to ash/resources/default_200_percent/cros/network/statusbar_network_vpn_badge.png diff --git a/ui/chromeos/resources/default_200_percent/network/statusbar_vpn_dark.png b/ash/resources/default_200_percent/cros/network/statusbar_vpn_dark.png similarity index 100% rename from ui/chromeos/resources/default_200_percent/network/statusbar_vpn_dark.png rename to ash/resources/default_200_percent/cros/network/statusbar_vpn_dark.png diff --git a/ui/chromeos/resources/default_200_percent/network/statusbar_wired.png b/ash/resources/default_200_percent/cros/network/statusbar_wired.png similarity index 100% rename from ui/chromeos/resources/default_200_percent/network/statusbar_wired.png rename to ash/resources/default_200_percent/cros/network/statusbar_wired.png diff --git a/ash/system/chromeos/DEPS b/ash/system/chromeos/DEPS index 24136dc37b5780..79b8e8ba13b700 100644 --- a/ash/system/chromeos/DEPS +++ b/ash/system/chromeos/DEPS @@ -1,5 +1,3 @@ include_rules = [ "+chromeos", - "+grit/ui_chromeos_resources.h", - "+grit/ui_chromeos_strings.h", ] diff --git a/ui/chromeos/network/network_icon.cc b/ash/system/chromeos/network/network_icon.cc similarity index 99% rename from ui/chromeos/network/network_icon.cc rename to ash/system/chromeos/network/network_icon.cc index 785b99e88765dc..a61f4814276d71 100644 --- a/ui/chromeos/network/network_icon.cc +++ b/ash/system/chromeos/network/network_icon.cc @@ -2,22 +2,22 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/chromeos/network/network_icon.h" +#include "ash/system/chromeos/network/network_icon.h" +#include "ash/system/chromeos/network/network_icon_animation.h" +#include "ash/system/chromeos/network/network_icon_animation_observer.h" #include "base/strings/utf_string_conversions.h" #include "chromeos/network/device_state.h" #include "chromeos/network/network_connection_handler.h" #include "chromeos/network/network_state.h" #include "chromeos/network/network_state_handler.h" #include "chromeos/network/portal_detector/network_portal_detector.h" -#include "grit/ui_chromeos_resources.h" -#include "grit/ui_chromeos_strings.h" +#include "grit/ash_resources.h" +#include "grit/ash_strings.h" #include "third_party/cros_system_api/dbus/service_constants.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/webui/web_ui_util.h" -#include "ui/chromeos/network/network_icon_animation.h" -#include "ui/chromeos/network/network_icon_animation_observer.h" #include "ui/gfx/canvas.h" #include "ui/gfx/image/image_skia_operations.h" #include "ui/gfx/image/image_skia_source.h" @@ -32,7 +32,7 @@ using chromeos::NetworkState; using chromeos::NetworkStateHandler; using chromeos::NetworkTypePattern; -namespace ui { +namespace ash { namespace network_icon { namespace { @@ -959,4 +959,4 @@ void PurgeNetworkIconCache() { } } // namespace network_icon -} // namespace ui +} // namespace ash diff --git a/ui/chromeos/network/network_icon.h b/ash/system/chromeos/network/network_icon.h similarity index 67% rename from ui/chromeos/network/network_icon.h rename to ash/system/chromeos/network/network_icon.h index 5227af3df0f529..7497930d643c81 100644 --- a/ui/chromeos/network/network_icon.h +++ b/ash/system/chromeos/network/network_icon.h @@ -2,20 +2,20 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_CHROMEOS_NETWORK_NETWORK_ICON_H_ -#define UI_CHROMEOS_NETWORK_NETWORK_ICON_H_ +#ifndef ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_ICON_H_ +#define ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_ICON_H_ #include +#include "ash/ash_export.h" #include "base/strings/string16.h" -#include "ui/chromeos/ui_chromeos_export.h" #include "ui/gfx/image/image_skia.h" namespace chromeos { class NetworkState; } -namespace ui { +namespace ash { namespace network_icon { class AnimationObserver; @@ -30,54 +30,54 @@ enum IconType { // Gets the image for the network associated with |service_path|. |network| must // not be NULL. |icon_type| determines the color theme and whether or not to // show the VPN badge. This caches badged icons per network per |icon_type|. -UI_CHROMEOS_EXPORT gfx::ImageSkia GetImageForNetwork( +ASH_EXPORT gfx::ImageSkia GetImageForNetwork( const chromeos::NetworkState* network, IconType icon_type); // Similar to GetImageForNetwork but returns the cached image url based on // |scale_factor| instead. -UI_CHROMEOS_EXPORT std::string GetImageUrlForNetwork( +ASH_EXPORT std::string GetImageUrlForNetwork( const chromeos::NetworkState* network, IconType icon_type, float scale_factor); // Gets the fulls strength image for a connected network type. -UI_CHROMEOS_EXPORT gfx::ImageSkia GetImageForConnectedNetwork( +ASH_EXPORT gfx::ImageSkia GetImageForConnectedNetwork( IconType icon_type, const std::string& network_type); // Gets the image for a connecting network type. -UI_CHROMEOS_EXPORT gfx::ImageSkia GetImageForConnectingNetwork( +ASH_EXPORT gfx::ImageSkia GetImageForConnectingNetwork( IconType icon_type, const std::string& network_type); // Gets the image for a disconnected network type. -UI_CHROMEOS_EXPORT gfx::ImageSkia GetImageForDisconnectedNetwork( +ASH_EXPORT gfx::ImageSkia GetImageForDisconnectedNetwork( IconType icon_type, const std::string& network_type); // Returns the label for |network| based on |icon_type|. |network| can be NULL. -UI_CHROMEOS_EXPORT base::string16 GetLabelForNetwork( +ASH_EXPORT base::string16 GetLabelForNetwork( const chromeos::NetworkState* network, IconType icon_type); // Updates and returns the appropriate message id if the cellular network // is uninitialized. -UI_CHROMEOS_EXPORT int GetCellularUninitializedMsg(); +ASH_EXPORT int GetCellularUninitializedMsg(); // Gets the correct icon and label for |icon_type|. Also sets |animating| // based on whether or not the icon is animating (i.e. connecting). -UI_CHROMEOS_EXPORT void GetDefaultNetworkImageAndLabel(IconType icon_type, - gfx::ImageSkia* image, - base::string16* label, - bool* animating); +ASH_EXPORT void GetDefaultNetworkImageAndLabel(IconType icon_type, + gfx::ImageSkia* image, + base::string16* label, + bool* animating); // Called when the list of networks changes. Retreives the list of networks // from the global NetworkStateHandler instance and removes cached entries // that are no longer in the list. -UI_CHROMEOS_EXPORT void PurgeNetworkIconCache(); +ASH_EXPORT void PurgeNetworkIconCache(); } // namespace network_icon -} // namespace ui +} // namespace ash -#endif // UI_CHROMEOS_NETWORK_NETWORK_ICON_H_ +#endif // ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_ICON_H_ diff --git a/ui/chromeos/network/network_icon_animation.cc b/ash/system/chromeos/network/network_icon_animation.cc similarity index 90% rename from ui/chromeos/network/network_icon_animation.cc rename to ash/system/chromeos/network/network_icon_animation.cc index 055a10b09aafe1..5065745c849f1a 100644 --- a/ui/chromeos/network/network_icon_animation.cc +++ b/ash/system/chromeos/network/network_icon_animation.cc @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ui/chromeos/network/network_icon_animation.h" +#include "ash/system/chromeos/network/network_icon_animation.h" -#include "ui/chromeos/network/network_icon_animation_observer.h" +#include "ash/system/chromeos/network/network_icon_animation_observer.h" namespace { const int kThrobDurationMs = 750; // Animation cycle length. } -namespace ui { +namespace ash { namespace network_icon { NetworkIconAnimation::NetworkIconAnimation() @@ -58,4 +58,4 @@ NetworkIconAnimation* NetworkIconAnimation::GetInstance() { } } // namespace network_icon -} // namespace ui +} // namespace ash diff --git a/ui/chromeos/network/network_icon_animation.h b/ash/system/chromeos/network/network_icon_animation.h similarity index 77% rename from ui/chromeos/network/network_icon_animation.h rename to ash/system/chromeos/network/network_icon_animation.h index ad73bb2b4de1d6..a34b80ed96957e 100644 --- a/ui/chromeos/network/network_icon_animation.h +++ b/ash/system/chromeos/network/network_icon_animation.h @@ -2,24 +2,24 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_CHROMEOS_NETWORK_NETWORK_ICON_ANIMATION_H_ -#define UI_CHROMEOS_NETWORK_NETWORK_ICON_ANIMATION_H_ +#ifndef ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_ICON_ANIMATION_H_ +#define ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_ICON_ANIMATION_H_ #include #include +#include "ash/ash_export.h" #include "base/observer_list.h" -#include "ui/chromeos/ui_chromeos_export.h" #include "ui/gfx/animation/animation_delegate.h" #include "ui/gfx/animation/throb_animation.h" -namespace ui { +namespace ash { namespace network_icon { class AnimationObserver; // Single instance class to handle icon animations and keep them in sync. -class UI_CHROMEOS_EXPORT NetworkIconAnimation : public gfx::AnimationDelegate { +class ASH_EXPORT NetworkIconAnimation : public gfx::AnimationDelegate { public: NetworkIconAnimation(); virtual ~NetworkIconAnimation(); @@ -43,6 +43,6 @@ class UI_CHROMEOS_EXPORT NetworkIconAnimation : public gfx::AnimationDelegate { }; } // namespace network_icon -} // namespace ui +} // namespace ash -#endif // UI_CHROMEOS_NETWORK_NETWORK_ICON_ANIMATION_H_ +#endif // ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_ICON_ANIMATION_H_ diff --git a/ui/chromeos/network/network_icon_animation_observer.h b/ash/system/chromeos/network/network_icon_animation_observer.h similarity index 62% rename from ui/chromeos/network/network_icon_animation_observer.h rename to ash/system/chromeos/network/network_icon_animation_observer.h index ad8dd1c8d93482..28a5c735d1b617 100644 --- a/ui/chromeos/network/network_icon_animation_observer.h +++ b/ash/system/chromeos/network/network_icon_animation_observer.h @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_CHROMEOS_NETWORK_NETWORK_ICON_ANIMATION_OBSERVER_H_ -#define UI_CHROMEOS_NETWORK_NETWORK_ICON_ANIMATION_OBSERVER_H_ +#ifndef ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_ICON_ANIMATION_OBSERVER_H_ +#define ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_ICON_ANIMATION_OBSERVER_H_ -#include "ui/chromeos/ui_chromeos_export.h" +#include "ash/ash_export.h" -namespace ui { +namespace ash { namespace network_icon { // Observer interface class for animating network icons. -class UI_CHROMEOS_EXPORT AnimationObserver { +class ASH_EXPORT AnimationObserver { public: // Called when the image has changed due to animation. The callback should // trigger a call to GetImageForNetwork() to retrieve the image. @@ -22,6 +22,6 @@ class UI_CHROMEOS_EXPORT AnimationObserver { }; } // namespace network_icon -} // namespace ui +} // namespace ash -#endif // UI_CHROMEOS_NETWORK_NETWORK_ICON_ANIMATION_OBSERVER_H_ +#endif // ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_ICON_ANIMATION_OBSERVER_H_ diff --git a/ash/system/chromeos/network/network_state_list_detailed_view.cc b/ash/system/chromeos/network/network_state_list_detailed_view.cc index b771e1924cd5b2..616dc27fc8d5f2 100644 --- a/ash/system/chromeos/network/network_state_list_detailed_view.cc +++ b/ash/system/chromeos/network/network_state_list_detailed_view.cc @@ -11,6 +11,8 @@ #include "ash/shell_delegate.h" #include "ash/shell_window_ids.h" #include "ash/system/chromeos/network/network_connect.h" +#include "ash/system/chromeos/network/network_icon.h" +#include "ash/system/chromeos/network/network_icon_animation.h" #include "ash/system/chromeos/network/tray_network_state_observer.h" #include "ash/system/tray/fixed_sized_scroll_view.h" #include "ash/system/tray/hover_highlight_view.h" @@ -31,13 +33,10 @@ #include "chromeos/network/network_state_handler.h" #include "grit/ash_resources.h" #include "grit/ash_strings.h" -#include "grit/ui_chromeos_strings.h" #include "third_party/cros_system_api/dbus/service_constants.h" #include "ui/aura/window.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" -#include "ui/chromeos/network/network_icon.h" -#include "ui/chromeos/network/network_icon_animation.h" #include "ui/views/bubble/bubble_delegate.h" #include "ui/views/controls/label.h" #include "ui/views/layout/box_layout.h" @@ -170,7 +169,7 @@ NetworkStateListDetailedView::NetworkStateListDetailedView( NetworkStateListDetailedView::~NetworkStateListDetailedView() { if (info_bubble_) info_bubble_->GetWidget()->CloseNow(); - ui::network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this); + network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this); } void NetworkStateListDetailedView::ManagerChanged() { @@ -486,10 +485,10 @@ void NetworkStateListDetailedView::UpdateNetworkList() { handler->GetNetworkState(info->service_path); if (!network) continue; - info->image = ui::network_icon::GetImageForNetwork( - network, ui::network_icon::ICON_TYPE_LIST); - info->label = ui::network_icon::GetLabelForNetwork( - network, ui::network_icon::ICON_TYPE_LIST); + info->image = network_icon::GetImageForNetwork( + network, network_icon::ICON_TYPE_LIST); + info->label = network_icon::GetLabelForNetwork( + network, network_icon::ICON_TYPE_LIST); info->highlight = network->IsConnectedState() || network->IsConnectingState(); info->disable = @@ -498,9 +497,9 @@ void NetworkStateListDetailedView::UpdateNetworkList() { animating = true; } if (animating) - ui::network_icon::NetworkIconAnimation::GetInstance()->AddObserver(this); + network_icon::NetworkIconAnimation::GetInstance()->AddObserver(this); else - ui::network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this); + network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this); // Get the updated list entries network_map_.clear(); @@ -612,7 +611,7 @@ bool NetworkStateListDetailedView::UpdateNetworkListEntries( if (list_type_ == LIST_TYPE_NETWORK) { // Cellular initializing - int status_message_id = ui::network_icon::GetCellularUninitializedMsg(); + int status_message_id = network_icon::GetCellularUninitializedMsg(); if (!status_message_id && handler->IsTechnologyEnabled(NetworkTypePattern::Mobile()) && !handler->FirstNetworkByType(NetworkTypePattern::Mobile())) { diff --git a/ash/system/chromeos/network/network_state_list_detailed_view.h b/ash/system/chromeos/network/network_state_list_detailed_view.h index f135cb1d606542..c8682358121fef 100644 --- a/ash/system/chromeos/network/network_state_list_detailed_view.h +++ b/ash/system/chromeos/network/network_state_list_detailed_view.h @@ -10,12 +10,12 @@ #include #include "ash/system/chromeos/network/network_detailed_view.h" +#include "ash/system/chromeos/network/network_icon.h" +#include "ash/system/chromeos/network/network_icon_animation_observer.h" #include "ash/system/tray/view_click_listener.h" #include "ash/system/user/login_status.h" #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" -#include "ui/chromeos/network/network_icon.h" -#include "ui/chromeos/network/network_icon_animation_observer.h" #include "ui/views/controls/button/button.h" namespace chromeos { @@ -39,7 +39,7 @@ class NetworkStateListDetailedView : public NetworkDetailedView, public views::ButtonListener, public ViewClickListener, - public ui::network_icon::AnimationObserver, + public network_icon::AnimationObserver, public base::SupportsWeakPtr { public: enum ListType { @@ -60,7 +60,7 @@ class NetworkStateListDetailedView virtual void NetworkServiceChanged( const chromeos::NetworkState* network) OVERRIDE; - // ui::network_icon::AnimationObserver overrides + // network_icon::AnimationObserver overrides virtual void NetworkIconChanged() OVERRIDE; protected: diff --git a/ash/system/chromeos/network/network_state_notifier.cc b/ash/system/chromeos/network/network_state_notifier.cc index efe0bd1b7aff7e..027b284e7b8884 100644 --- a/ash/system/chromeos/network/network_state_notifier.cc +++ b/ash/system/chromeos/network/network_state_notifier.cc @@ -19,7 +19,6 @@ #include "chromeos/network/shill_property_util.h" #include "grit/ash_resources.h" #include "grit/ash_strings.h" -#include "grit/ui_chromeos_resources.h" #include "third_party/cros_system_api/dbus/service_constants.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" diff --git a/ash/system/chromeos/network/tray_network.cc b/ash/system/chromeos/network/tray_network.cc index 420752b1bb6256..c56a948d1a1405 100644 --- a/ash/system/chromeos/network/tray_network.cc +++ b/ash/system/chromeos/network/tray_network.cc @@ -7,6 +7,7 @@ #include "ash/ash_switches.h" #include "ash/metrics/user_metrics_recorder.h" #include "ash/shell.h" +#include "ash/system/chromeos/network/network_icon_animation.h" #include "ash/system/chromeos/network/network_state_list_detailed_view.h" #include "ash/system/chromeos/network/tray_network_state_observer.h" #include "ash/system/tray/system_tray.h" @@ -22,12 +23,10 @@ #include "chromeos/network/network_state_handler.h" #include "grit/ash_resources.h" #include "grit/ash_strings.h" -#include "grit/ui_chromeos_strings.h" #include "third_party/cros_system_api/dbus/service_constants.h" #include "ui/accessibility/ax_view_state.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" -#include "ui/chromeos/network/network_icon_animation.h" #include "ui/views/controls/image_view.h" #include "ui/views/controls/link.h" #include "ui/views/controls/link_listener.h" @@ -43,7 +42,7 @@ namespace ash { namespace tray { class NetworkTrayView : public TrayItemView, - public ui::network_icon::AnimationObserver { + public network_icon::AnimationObserver { public: explicit NetworkTrayView(TrayNetwork* network_tray) : TrayItemView(network_tray), @@ -58,7 +57,7 @@ class NetworkTrayView : public TrayItemView, } virtual ~NetworkTrayView() { - ui::network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this); + network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this); } virtual const char* GetClassName() const OVERRIDE { @@ -71,15 +70,14 @@ class NetworkTrayView : public TrayItemView, gfx::ImageSkia image; base::string16 name; bool animating = false; - ui::network_icon::GetDefaultNetworkImageAndLabel( - ui::network_icon::ICON_TYPE_TRAY, &image, &name, &animating); + network_icon::GetDefaultNetworkImageAndLabel( + network_icon::ICON_TYPE_TRAY, &image, &name, &animating); bool show_in_tray = !image.isNull(); UpdateIcon(show_in_tray, image); if (animating) - ui::network_icon::NetworkIconAnimation::GetInstance()->AddObserver(this); + network_icon::NetworkIconAnimation::GetInstance()->AddObserver(this); else - ui::network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver( - this); + network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this); // Update accessibility. const NetworkState* connected_network = handler->ConnectedNetworkByType(NetworkTypePattern::NonVirtual()); @@ -105,7 +103,7 @@ class NetworkTrayView : public TrayItemView, state->role = ui::AX_ROLE_BUTTON; } - // ui::network_icon::AnimationObserver + // network_icon::AnimationObserver virtual void NetworkIconChanged() OVERRIDE { UpdateNetworkStateHandlerIcon(); } @@ -140,7 +138,7 @@ class NetworkTrayView : public TrayItemView, }; class NetworkDefaultView : public TrayItemMore, - public ui::network_icon::AnimationObserver { + public network_icon::AnimationObserver { public: NetworkDefaultView(TrayNetwork* network_tray, bool show_more) : TrayItemMore(network_tray, show_more), @@ -149,26 +147,25 @@ class NetworkDefaultView : public TrayItemMore, } virtual ~NetworkDefaultView() { - ui::network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this); + network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this); } void Update() { gfx::ImageSkia image; base::string16 label; bool animating = false; - ui::network_icon::GetDefaultNetworkImageAndLabel( - ui::network_icon::ICON_TYPE_DEFAULT_VIEW, &image, &label, &animating); + network_icon::GetDefaultNetworkImageAndLabel( + network_icon::ICON_TYPE_DEFAULT_VIEW, &image, &label, &animating); if (animating) - ui::network_icon::NetworkIconAnimation::GetInstance()->AddObserver(this); + network_icon::NetworkIconAnimation::GetInstance()->AddObserver(this); else - ui::network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver( - this); + network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this); SetImage(&image); SetLabel(label); SetAccessibleName(label); } - // ui::network_icon::AnimationObserver + // network_icon::AnimationObserver virtual void NetworkIconChanged() OVERRIDE { Update(); } diff --git a/ash/system/chromeos/network/tray_network.h b/ash/system/chromeos/network/tray_network.h index ef9d37b129fc27..54f79c652af05c 100644 --- a/ash/system/chromeos/network/tray_network.h +++ b/ash/system/chromeos/network/tray_network.h @@ -7,6 +7,7 @@ #include +#include "ash/system/chromeos/network/network_icon.h" #include "ash/system/chromeos/network/network_observer.h" #include "ash/system/chromeos/network/network_portal_detector_observer.h" #include "ash/system/chromeos/network/tray_network_state_observer.h" diff --git a/ash/system/chromeos/network/tray_network_state_observer.cc b/ash/system/chromeos/network/tray_network_state_observer.cc index 4239be295bbdc7..b83edcbb693293 100644 --- a/ash/system/chromeos/network/tray_network_state_observer.cc +++ b/ash/system/chromeos/network/tray_network_state_observer.cc @@ -7,11 +7,11 @@ #include #include +#include "ash/system/chromeos/network/network_icon.h" #include "base/location.h" #include "chromeos/network/network_state.h" #include "chromeos/network/network_state_handler.h" #include "third_party/cros_system_api/dbus/service_constants.h" -#include "ui/chromeos/network/network_icon.h" using chromeos::NetworkHandler; @@ -34,7 +34,7 @@ TrayNetworkStateObserver::~TrayNetworkStateObserver() { void TrayNetworkStateObserver::NetworkListChanged() { delegate_->NetworkStateChanged(true); - ui::network_icon::PurgeNetworkIconCache(); + network_icon::PurgeNetworkIconCache(); } void TrayNetworkStateObserver::DeviceListChanged() { diff --git a/ash/system/chromeos/network/tray_vpn.cc b/ash/system/chromeos/network/tray_vpn.cc index 05209775050f3d..3f73c7a67d6ff1 100644 --- a/ash/system/chromeos/network/tray_vpn.cc +++ b/ash/system/chromeos/network/tray_vpn.cc @@ -6,6 +6,7 @@ #include "ash/metrics/user_metrics_recorder.h" #include "ash/shell.h" +#include "ash/system/chromeos/network/network_icon_animation.h" #include "ash/system/chromeos/network/network_state_list_detailed_view.h" #include "ash/system/tray/system_tray.h" #include "ash/system/tray/system_tray_delegate.h" @@ -18,7 +19,6 @@ #include "third_party/cros_system_api/dbus/service_constants.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" -#include "ui/chromeos/network/network_icon_animation.h" using chromeos::NetworkHandler; using chromeos::NetworkState; @@ -29,7 +29,7 @@ namespace ash { namespace tray { class VpnDefaultView : public TrayItemMore, - public ui::network_icon::AnimationObserver { + public network_icon::AnimationObserver { public: VpnDefaultView(SystemTrayItem* owner, bool show_more) : TrayItemMore(owner, show_more) { @@ -37,7 +37,7 @@ class VpnDefaultView : public TrayItemMore, } virtual ~VpnDefaultView() { - ui::network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this); + network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this); } static bool ShouldShow() { @@ -55,16 +55,15 @@ class VpnDefaultView : public TrayItemMore, bool animating = false; GetNetworkStateHandlerImageAndLabel(&image, &label, &animating); if (animating) - ui::network_icon::NetworkIconAnimation::GetInstance()->AddObserver(this); + network_icon::NetworkIconAnimation::GetInstance()->AddObserver(this); else - ui::network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver( - this); + network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this); SetImage(&image); SetLabel(label); SetAccessibleName(label); } - // ui::network_icon::AnimationObserver + // network_icon::AnimationObserver virtual void NetworkIconChanged() OVERRIDE { Update(); } @@ -78,8 +77,8 @@ class VpnDefaultView : public TrayItemMore, const NetworkState* vpn = handler->FirstNetworkByType(NetworkTypePattern::VPN()); if (!vpn || (vpn->connection_state() == shill::kStateIdle)) { - *image = ui::network_icon::GetImageForDisconnectedNetwork( - ui::network_icon::ICON_TYPE_DEFAULT_VIEW, shill::kTypeVPN); + *image = network_icon::GetImageForDisconnectedNetwork( + network_icon::ICON_TYPE_DEFAULT_VIEW, shill::kTypeVPN); if (label) { *label = l10n_util::GetStringUTF16( IDS_ASH_STATUS_TRAY_VPN_DISCONNECTED); @@ -88,11 +87,11 @@ class VpnDefaultView : public TrayItemMore, return; } *animating = vpn->IsConnectingState(); - *image = ui::network_icon::GetImageForNetwork( - vpn, ui::network_icon::ICON_TYPE_DEFAULT_VIEW); + *image = network_icon::GetImageForNetwork( + vpn, network_icon::ICON_TYPE_DEFAULT_VIEW); if (label) { - *label = ui::network_icon::GetLabelForNetwork( - vpn, ui::network_icon::ICON_TYPE_DEFAULT_VIEW); + *label = network_icon::GetLabelForNetwork( + vpn, network_icon::ICON_TYPE_DEFAULT_VIEW); } } diff --git a/chrome/browser/chromeos/status/network_menu.cc b/chrome/browser/chromeos/status/network_menu.cc index 8f4c81a106b875..63b48d78319704 100644 --- a/chrome/browser/chromeos/status/network_menu.cc +++ b/chrome/browser/chromeos/status/network_menu.cc @@ -9,6 +9,7 @@ #include "ash/shell.h" #include "ash/shell_delegate.h" #include "ash/system/chromeos/network/network_connect.h" +#include "ash/system/chromeos/network/network_icon.h" #include "base/bind.h" #include "base/logging.h" #include "base/strings/stringprintf.h" @@ -31,7 +32,6 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/menu_model.h" #include "ui/base/resource/resource_bundle.h" -#include "ui/chromeos/network/network_icon.h" #include "ui/gfx/image/image_skia.h" namespace chromeos { @@ -363,8 +363,8 @@ void MainMenuModel::AddWirelessNetworkMenuItem(const NetworkState* network, if (ShouldHighlightNetwork(network)) flag |= FLAG_ASSOCIATED; - const gfx::ImageSkia icon = ui::network_icon::GetImageForNetwork( - network, ui::network_icon::ICON_TYPE_LIST); + const gfx::ImageSkia icon = ash::network_icon::GetImageForNetwork( + network, ash::network_icon::ICON_TYPE_LIST); menu_items_.push_back( MenuItem(ui::MenuModel::TYPE_COMMAND, label, icon, network->path(), flag)); @@ -403,8 +403,8 @@ void MainMenuModel::InitMenuItems(bool should_open_button_options) { int flag = FLAG_ETHERNET; if (ShouldHighlightNetwork(ethernet_network)) flag |= FLAG_ASSOCIATED; - const gfx::ImageSkia icon = ui::network_icon::GetImageForNetwork( - ethernet_network, ui::network_icon::ICON_TYPE_LIST); + const gfx::ImageSkia icon = ash::network_icon::GetImageForNetwork( + ethernet_network, ash::network_icon::ICON_TYPE_LIST); menu_items_.push_back(MenuItem(ui::MenuModel::TYPE_COMMAND, label, icon, std::string(), flag)); } @@ -444,8 +444,8 @@ void MainMenuModel::InitMenuItems(bool should_open_button_options) { bool isActive = ShouldHighlightNetwork(network); if (isActive) flag |= FLAG_ASSOCIATED; - const gfx::ImageSkia icon = ui::network_icon::GetImageForNetwork( - network, ui::network_icon::ICON_TYPE_LIST); + const gfx::ImageSkia icon = ash::network_icon::GetImageForNetwork( + network, ash::network_icon::ICON_TYPE_LIST); menu_items_.push_back( MenuItem(ui::MenuModel::TYPE_COMMAND, label, icon, network->path(), flag)); @@ -456,8 +456,8 @@ void MainMenuModel::InitMenuItems(bool should_open_button_options) { handler->GetDeviceStateByType(NetworkTypePattern::Cellular()); if (cellular_device && cellular_device->support_network_scan()) { const gfx::ImageSkia icon = - ui::network_icon::GetImageForDisconnectedNetwork( - ui::network_icon::ICON_TYPE_LIST, shill::kTypeCellular); + ash::network_icon::GetImageForDisconnectedNetwork( + ash::network_icon::ICON_TYPE_LIST, shill::kTypeCellular); menu_items_.push_back(MenuItem( ui::MenuModel::TYPE_COMMAND, l10n_util::GetStringUTF16( @@ -466,7 +466,7 @@ void MainMenuModel::InitMenuItems(bool should_open_button_options) { } } else { int initializing_message_id = - ui::network_icon::GetCellularUninitializedMsg(); + ash::network_icon::GetCellularUninitializedMsg(); if (initializing_message_id) { // Initializing cellular modem... AddMessageItem(l10n_util::GetStringUTF16(initializing_message_id)); @@ -505,8 +505,9 @@ void MainMenuModel::InitMenuItems(bool should_open_button_options) { } if (scanning_msg) AddMessageItem(l10n_util::GetStringUTF16(scanning_msg)); - const gfx::ImageSkia icon = ui::network_icon::GetImageForConnectedNetwork( - ui::network_icon::ICON_TYPE_LIST, shill::kTypeWifi); + const gfx::ImageSkia icon = + ash::network_icon::GetImageForConnectedNetwork( + ash::network_icon::ICON_TYPE_LIST, shill::kTypeWifi); menu_items_.push_back(MenuItem( ui::MenuModel::TYPE_COMMAND, l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_OTHER_WIFI_NETWORKS), diff --git a/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc b/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc index 15e51283c7102e..19fe7ed6dd18f3 100644 --- a/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc +++ b/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc @@ -6,6 +6,8 @@ #include +#include "ash/system/chromeos/network/network_icon.h" +#include "ash/system/chromeos/network/network_icon_animation.h" #include "base/time/time.h" #include "base/values.h" #include "chrome/browser/chromeos/login/ui/login_display_host.h" @@ -14,8 +16,6 @@ #include "content/public/browser/web_ui.h" #include "ui/base/models/menu_model.h" #include "ui/base/webui/web_ui_util.h" -#include "ui/chromeos/network/network_icon.h" -#include "ui/chromeos/network/network_icon_animation.h" #include "ui/gfx/font_list.h" #include "ui/gfx/image/image.h" #include "ui/gfx/image/image_skia.h" @@ -128,7 +128,7 @@ NetworkDropdown::NetworkDropdown(Actor* actor, } NetworkDropdown::~NetworkDropdown() { - ui::network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this); + ash::network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this); if (NetworkHandler::IsInitialized()) { NetworkHandler::Get()->network_state_handler()->RemoveObserver( this, FROM_HERE); @@ -182,12 +182,13 @@ void NetworkDropdown::SetNetworkIconAndText() { base::string16 text; gfx::ImageSkia icon_image; bool animating = false; - ui::network_icon::GetDefaultNetworkImageAndLabel( - ui::network_icon::ICON_TYPE_LIST, &icon_image, &text, &animating); + ash::network_icon::GetDefaultNetworkImageAndLabel( + ash::network_icon::ICON_TYPE_LIST, &icon_image, &text, &animating); if (animating) { - ui::network_icon::NetworkIconAnimation::GetInstance()->AddObserver(this); + ash::network_icon::NetworkIconAnimation::GetInstance()->AddObserver(this); } else { - ui::network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this); + ash::network_icon::NetworkIconAnimation::GetInstance()-> + RemoveObserver(this); } SkBitmap icon_bitmap = icon_image.GetRepresentation( web_ui_->GetDeviceScaleFactor()).sk_bitmap(); diff --git a/chrome/browser/ui/webui/chromeos/login/network_dropdown.h b/chrome/browser/ui/webui/chromeos/login/network_dropdown.h index f7d798fe30e4ef..56b6ec9d139614 100644 --- a/chrome/browser/ui/webui/chromeos/login/network_dropdown.h +++ b/chrome/browser/ui/webui/chromeos/login/network_dropdown.h @@ -5,11 +5,11 @@ #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_NETWORK_DROPDOWN_H_ #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_NETWORK_DROPDOWN_H_ +#include "ash/system/chromeos/network/network_icon_animation_observer.h" #include "base/basictypes.h" #include "base/timer/timer.h" #include "chrome/browser/chromeos/status/network_menu.h" #include "chromeos/network/network_state_handler_observer.h" -#include "ui/chromeos/network/network_icon_animation_observer.h" #include "ui/gfx/native_widget_types.h" namespace content { @@ -24,7 +24,7 @@ class NetworkState; // Class which implements network dropdown menu using WebUI. class NetworkDropdown : public NetworkMenu::Delegate, public NetworkStateHandlerObserver, - public ui::network_icon::AnimationObserver { + public ash::network_icon::AnimationObserver { public: class Actor { public: diff --git a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc index 4254352f12a091..4d2bdc759d6fad 100644 --- a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc @@ -11,6 +11,7 @@ #include #include "ash/system/chromeos/network/network_connect.h" +#include "ash/system/chromeos/network/network_icon.h" #include "base/basictypes.h" #include "base/bind.h" #include "base/bind_helpers.h" @@ -51,11 +52,9 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" #include "grit/ash_resources.h" -#include "grit/ui_chromeos_resources.h" #include "third_party/cros_system_api/dbus/service_constants.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/webui/web_ui_util.h" -#include "ui/chromeos/network/network_icon.h" #include "ui/gfx/image/image_skia.h" namespace chromeos { @@ -228,8 +227,8 @@ base::DictionaryValue* BuildNetworkDictionary( profile_prefs, g_browser_process->local_state(), *network); network_info->SetBoolean(kNetworkInfoKeyPolicyManaged, has_policy); - std::string icon_url = ui::network_icon::GetImageUrlForNetwork( - network, ui::network_icon::ICON_TYPE_LIST, icon_scale_factor); + std::string icon_url = ash::network_icon::GetImageUrlForNetwork( + network, ash::network_icon::ICON_TYPE_LIST, icon_scale_factor); network_info->SetString(kNetworkInfoKeyIconURL, icon_url); network_info->SetString(kNetworkInfoKeyServicePath, network->path()); diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi index dc291e9c39f2ad..5de4f93645c2b6 100644 --- a/chrome/chrome_browser_ui.gypi +++ b/chrome/chrome_browser_ui.gypi @@ -2680,8 +2680,6 @@ 'sources': [ '<@(chrome_browser_ui_chromeos_sources)' ], 'dependencies': [ 'browser_chromeos', - '../ui/chromeos/ui_chromeos.gyp:ui_chromeos', - '../ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources', ], }, { 'sources': [ '<@(chrome_browser_ui_non_chromeos_sources)' ], diff --git a/chrome/chrome_repack_chrome_100_percent.gypi b/chrome/chrome_repack_chrome_100_percent.gypi index 8f282d4d38c84f..6fafa7b98fc9c0 100644 --- a/chrome/chrome_repack_chrome_100_percent.gypi +++ b/chrome/chrome_repack_chrome_100_percent.gypi @@ -22,11 +22,6 @@ '<(SHARED_INTERMEDIATE_DIR)/ash/resources/ash_resources_100_percent.pak', ], }], - ['chromeos==1', { - 'pak_inputs': [ - '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/resources/ui_chromeos_resources_100_percent.pak', - ], - }], ], }, 'includes': [ '../build/repack_action.gypi' ], diff --git a/chrome/chrome_repack_chrome_200_percent.gypi b/chrome/chrome_repack_chrome_200_percent.gypi index b086d25b2521a0..e903d6b2aeaf53 100644 --- a/chrome/chrome_repack_chrome_200_percent.gypi +++ b/chrome/chrome_repack_chrome_200_percent.gypi @@ -22,11 +22,6 @@ '<(SHARED_INTERMEDIATE_DIR)/ash/resources/ash_resources_200_percent.pak', ], }], - ['chromeos==1', { - 'pak_inputs': [ - '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/resources/ui_chromeos_resources_200_percent.pak', - ], - }], ], }, 'includes': [ '../build/repack_action.gypi' ], diff --git a/chrome/chrome_repack_locales.gypi b/chrome/chrome_repack_locales.gypi index 4cff284d1eefe6..fc70f7466108cb 100644 --- a/chrome/chrome_repack_locales.gypi +++ b/chrome/chrome_repack_locales.gypi @@ -14,16 +14,11 @@ }, { # else: branding!="Chrome" 'branding_flag': ['-b', 'chromium',], }], - ['chromeos==1', { - 'chromeos_flag': ['--chromeos'], - }, { - 'chromeos_flag': [''], - }], ], }, 'inputs': [ '<(repack_locales_path)', - ' - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ui/chromeos/ui_chromeos.gyp b/ui/chromeos/ui_chromeos.gyp index ad1bf6972a0ef3..9a87672bfacc19 100644 --- a/ui/chromeos/ui_chromeos.gyp +++ b/ui/chromeos/ui_chromeos.gyp @@ -7,40 +7,6 @@ 'chromium_code': 1, }, 'targets': [ - { - 'target_name': 'ui_chromeos_resources', - 'type': 'none', - 'variables': { - 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/resources', - }, - 'actions': [ - { - 'action_name': 'ui_chromeos_resources', - 'variables': { - 'grit_grd_file': 'resources/ui_chromeos_resources.grd', - }, - 'includes': [ '../../build/grit_action.gypi' ], - }, - ], - 'includes': [ '../../build/grit_target.gypi' ], - }, - { - 'target_name': 'ui_chromeos_strings', - 'type': 'none', - 'variables': { - 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/strings', - }, - 'actions': [ - { - 'action_name': 'generate_ui_chromeos_strings', - 'variables': { - 'grit_grd_file': 'ui_chromeos_strings.grd', - }, - 'includes': [ '../../build/grit_action.gypi' ], - }, - ], - 'includes': [ '../../build/grit_target.gypi' ], - }, { 'target_name': 'ui_chromeos', 'type': '<(component)', @@ -49,20 +15,12 @@ '../../skia/skia.gyp:skia', '../aura/aura.gyp:aura', '../events/events.gyp:events', - '../events/events.gyp:gesture_detection', '../wm/wm.gyp:wm', - 'ui_chromeos_resources', - 'ui_chromeos_strings', ], 'defines': [ 'UI_CHROMEOS_IMPLEMENTATION', ], 'sources': [ - 'network/network_icon.cc', - 'network/network_icon.h', - 'network/network_icon_animation.cc', - 'network/network_icon_animation.h', - 'network/network_icon_animation_observer.h', 'touch_exploration_controller.cc', 'touch_exploration_controller.h', 'user_activity_power_manager_notifier.cc', diff --git a/ui/chromeos/ui_chromeos_strings.grd b/ui/chromeos/ui_chromeos_strings.grd deleted file mode 100644 index 22a4f8f32fb0bb..00000000000000 --- a/ui/chromeos/ui_chromeos_strings.grd +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Searching for cellular networks... - - - Ethernet - - - Initializing cellular modem... - - - Activating $1YBH Cellular - - - Connected to $1GoogleGuest - - - Connecting to $1GoogleGuest - - - Activate $1YBH Cellular - - - $1YBH Cellular: Activating... - - - $1GoogleGuest: Connecting... - - - No network - - - -