| 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/tray_network.h" | 5 #include "ash/system/chromeos/network/tray_network.h" |
| 6 | 6 |
| 7 #include "ash/ash_switches.h" | 7 #include "ash/ash_switches.h" |
| 8 #include "ash/metrics/user_metrics_recorder.h" | 8 #include "ash/metrics/user_metrics_recorder.h" |
| 9 #include "ash/shelf/shelf_util.h" | 9 #include "ash/shelf/shelf_util.h" |
| 10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
| 11 #include "ash/system/chromeos/network/network_state_list_detailed_view.h" | 11 #include "ash/system/chromeos/network/network_state_list_detailed_view.h" |
| 12 #include "ash/system/chromeos/network/tray_network_state_observer.h" | 12 #include "ash/system/chromeos/network/tray_network_state_observer.h" |
| 13 #include "ash/system/tray/system_tray.h" | 13 #include "ash/system/tray/system_tray.h" |
| 14 #include "ash/system/tray/system_tray_delegate.h" | 14 #include "ash/system/tray/system_tray_delegate.h" |
| 15 #include "ash/system/tray/system_tray_notifier.h" | 15 #include "ash/system/tray/system_tray_notifier.h" |
| 16 #include "ash/system/tray/tray_constants.h" | 16 #include "ash/system/tray/tray_constants.h" |
| 17 #include "ash/system/tray/tray_item_more.h" | 17 #include "ash/system/tray/tray_item_more.h" |
| 18 #include "ash/system/tray/tray_item_view.h" | 18 #include "ash/system/tray/tray_item_view.h" |
| 19 #include "ash/system/tray/tray_utils.h" | 19 #include "ash/system/tray/tray_utils.h" |
| 20 #include "ash/wm/common/shelf/wm_shelf_util.h" |
| 20 #include "base/command_line.h" | 21 #include "base/command_line.h" |
| 21 #include "base/strings/utf_string_conversions.h" | 22 #include "base/strings/utf_string_conversions.h" |
| 22 #include "chromeos/network/network_state.h" | 23 #include "chromeos/network/network_state.h" |
| 23 #include "chromeos/network/network_state_handler.h" | 24 #include "chromeos/network/network_state_handler.h" |
| 24 #include "grit/ash_resources.h" | 25 #include "grit/ash_resources.h" |
| 25 #include "grit/ash_strings.h" | 26 #include "grit/ash_strings.h" |
| 26 #include "grit/ui_chromeos_strings.h" | 27 #include "grit/ui_chromeos_strings.h" |
| 27 #include "third_party/cros_system_api/dbus/service_constants.h" | 28 #include "third_party/cros_system_api/dbus/service_constants.h" |
| 28 #include "ui/accessibility/ax_view_state.h" | 29 #include "ui/accessibility/ax_view_state.h" |
| 29 #include "ui/base/l10n/l10n_util.h" | 30 #include "ui/base/l10n/l10n_util.h" |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 handler->ConnectedNetworkByType(NetworkTypePattern::NonVirtual()); | 86 handler->ConnectedNetworkByType(NetworkTypePattern::NonVirtual()); |
| 86 if (connected_network) { | 87 if (connected_network) { |
| 87 UpdateConnectionStatus(base::UTF8ToUTF16(connected_network->name()), | 88 UpdateConnectionStatus(base::UTF8ToUTF16(connected_network->name()), |
| 88 true); | 89 true); |
| 89 } else { | 90 } else { |
| 90 UpdateConnectionStatus(base::string16(), false); | 91 UpdateConnectionStatus(base::string16(), false); |
| 91 } | 92 } |
| 92 } | 93 } |
| 93 | 94 |
| 94 void UpdateAlignment(wm::ShelfAlignment alignment) { | 95 void UpdateAlignment(wm::ShelfAlignment alignment) { |
| 95 SetLayoutManager(new views::BoxLayout(IsHorizontalAlignment(alignment) | 96 SetLayoutManager(new views::BoxLayout(wm::IsHorizontalAlignment(alignment) |
| 96 ? views::BoxLayout::kHorizontal | 97 ? views::BoxLayout::kHorizontal |
| 97 : views::BoxLayout::kVertical, | 98 : views::BoxLayout::kVertical, |
| 98 0, 0, 0)); | 99 0, 0, 0)); |
| 99 Layout(); | 100 Layout(); |
| 100 } | 101 } |
| 101 | 102 |
| 102 // views::View override. | 103 // views::View override. |
| 103 void GetAccessibleState(ui::AXViewState* state) override { | 104 void GetAccessibleState(ui::AXViewState* state) override { |
| 104 state->name = connection_status_string_; | 105 state->name = connection_status_string_; |
| 105 state->role = ui::AX_ROLE_BUTTON; | 106 state->role = ui::AX_ROLE_BUTTON; |
| (...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 335 void TrayNetwork::NetworkStateChanged() { | 336 void TrayNetwork::NetworkStateChanged() { |
| 336 if (tray_) | 337 if (tray_) |
| 337 tray_->UpdateNetworkStateHandlerIcon(); | 338 tray_->UpdateNetworkStateHandlerIcon(); |
| 338 if (default_) | 339 if (default_) |
| 339 default_->Update(); | 340 default_->Update(); |
| 340 if (detailed_) | 341 if (detailed_) |
| 341 detailed_->Update(); | 342 detailed_->Update(); |
| 342 } | 343 } |
| 343 | 344 |
| 344 } // namespace ash | 345 } // namespace ash |
| OLD | NEW |