| 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/network/tray_network.h" | 5 #include "ash/system/network/tray_network.h" |
| 6 | 6 |
| 7 #include "ash/common/wm_shell.h" | |
| 8 #include "ash/resources/grit/ash_resources.h" | 7 #include "ash/resources/grit/ash_resources.h" |
| 9 #include "ash/shelf/wm_shelf_util.h" | 8 #include "ash/shelf/wm_shelf_util.h" |
| 10 #include "ash/strings/grit/ash_strings.h" | 9 #include "ash/strings/grit/ash_strings.h" |
| 11 #include "ash/system/network/network_icon.h" | 10 #include "ash/system/network/network_icon.h" |
| 12 #include "ash/system/network/network_icon_animation.h" | 11 #include "ash/system/network/network_icon_animation.h" |
| 13 #include "ash/system/network/network_icon_animation_observer.h" | 12 #include "ash/system/network/network_icon_animation_observer.h" |
| 14 #include "ash/system/network/network_state_list_detailed_view.h" | 13 #include "ash/system/network/network_state_list_detailed_view.h" |
| 15 #include "ash/system/network/tray_network_state_observer.h" | 14 #include "ash/system/network/tray_network_state_observer.h" |
| 16 #include "ash/system/tray/system_tray.h" | 15 #include "ash/system/tray/system_tray.h" |
| 17 #include "ash/system/tray/system_tray_delegate.h" | 16 #include "ash/system/tray/system_tray_delegate.h" |
| 18 #include "ash/system/tray/system_tray_notifier.h" | 17 #include "ash/system/tray/system_tray_notifier.h" |
| 19 #include "ash/system/tray/tray_constants.h" | 18 #include "ash/system/tray/tray_constants.h" |
| 20 #include "ash/system/tray/tray_item_more.h" | 19 #include "ash/system/tray/tray_item_more.h" |
| 21 #include "ash/system/tray/tray_item_view.h" | 20 #include "ash/system/tray/tray_item_view.h" |
| 22 #include "ash/system/tray/tray_popup_item_style.h" | 21 #include "ash/system/tray/tray_popup_item_style.h" |
| 23 #include "ash/system/tray/tray_utils.h" | 22 #include "ash/system/tray/tray_utils.h" |
| 23 #include "ash/wm_shell.h" |
| 24 #include "base/command_line.h" | 24 #include "base/command_line.h" |
| 25 #include "base/strings/utf_string_conversions.h" | 25 #include "base/strings/utf_string_conversions.h" |
| 26 #include "chromeos/network/network_state.h" | 26 #include "chromeos/network/network_state.h" |
| 27 #include "chromeos/network/network_state_handler.h" | 27 #include "chromeos/network/network_state_handler.h" |
| 28 #include "third_party/cros_system_api/dbus/service_constants.h" | 28 #include "third_party/cros_system_api/dbus/service_constants.h" |
| 29 #include "ui/accessibility/ax_node_data.h" | 29 #include "ui/accessibility/ax_node_data.h" |
| 30 #include "ui/base/l10n/l10n_util.h" | 30 #include "ui/base/l10n/l10n_util.h" |
| 31 #include "ui/base/resource/resource_bundle.h" | 31 #include "ui/base/resource/resource_bundle.h" |
| 32 #include "ui/views/controls/image_view.h" | 32 #include "ui/views/controls/image_view.h" |
| 33 #include "ui/views/controls/link.h" | 33 #include "ui/views/controls/link.h" |
| (...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 332 void TrayNetwork::NetworkStateChanged() { | 332 void TrayNetwork::NetworkStateChanged() { |
| 333 if (tray_) | 333 if (tray_) |
| 334 tray_->UpdateNetworkStateHandlerIcon(); | 334 tray_->UpdateNetworkStateHandlerIcon(); |
| 335 if (default_) | 335 if (default_) |
| 336 default_->Update(); | 336 default_->Update(); |
| 337 if (detailed_) | 337 if (detailed_) |
| 338 detailed_->Update(); | 338 detailed_->Update(); |
| 339 } | 339 } |
| 340 | 340 |
| 341 } // namespace ash | 341 } // namespace ash |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2729363002:
chromeos: Move files in //ash/common to //ash, part 3 (Closed)
