| 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_state_list_detailed_view.h" | 5 #include "ash/system/chromeos/network/network_state_list_detailed_view.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "ash/ash_constants.h" | 10 #include "ash/ash_constants.h" |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 #include "chromeos/chromeos_switches.h" | 35 #include "chromeos/chromeos_switches.h" |
| 36 #include "chromeos/login/login_state.h" | 36 #include "chromeos/login/login_state.h" |
| 37 #include "chromeos/network/device_state.h" | 37 #include "chromeos/network/device_state.h" |
| 38 #include "chromeos/network/managed_network_configuration_handler.h" | 38 #include "chromeos/network/managed_network_configuration_handler.h" |
| 39 #include "chromeos/network/network_state.h" | 39 #include "chromeos/network/network_state.h" |
| 40 #include "chromeos/network/network_state_handler.h" | 40 #include "chromeos/network/network_state_handler.h" |
| 41 #include "grit/ash_resources.h" | 41 #include "grit/ash_resources.h" |
| 42 #include "grit/ash_strings.h" | 42 #include "grit/ash_strings.h" |
| 43 #include "grit/ui_chromeos_strings.h" | 43 #include "grit/ui_chromeos_strings.h" |
| 44 #include "third_party/cros_system_api/dbus/service_constants.h" | 44 #include "third_party/cros_system_api/dbus/service_constants.h" |
| 45 #include "ui/accessibility/ax_enums.h" |
| 45 #include "ui/accessibility/ax_view_state.h" | 46 #include "ui/accessibility/ax_view_state.h" |
| 46 #include "ui/aura/window.h" | 47 #include "ui/aura/window.h" |
| 47 #include "ui/base/l10n/l10n_util.h" | 48 #include "ui/base/l10n/l10n_util.h" |
| 48 #include "ui/base/resource/resource_bundle.h" | 49 #include "ui/base/resource/resource_bundle.h" |
| 49 #include "ui/chromeos/network/network_connect.h" | 50 #include "ui/chromeos/network/network_connect.h" |
| 50 #include "ui/chromeos/network/network_icon.h" | 51 #include "ui/chromeos/network/network_icon.h" |
| 51 #include "ui/chromeos/network/network_icon_animation.h" | 52 #include "ui/chromeos/network/network_icon_animation.h" |
| 52 #include "ui/chromeos/network/network_info.h" | 53 #include "ui/chromeos/network/network_info.h" |
| 53 #include "ui/chromeos/network/network_list.h" | 54 #include "ui/chromeos/network/network_list.h" |
| 54 #include "ui/chromeos/network/network_list_view_base.h" | 55 #include "ui/chromeos/network/network_list_view_base.h" |
| (...skipping 863 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 918 label->SetEnabledColor(SkColorSetARGB(192, 0, 0, 0)); | 919 label->SetEnabledColor(SkColorSetARGB(192, 0, 0, 0)); |
| 919 return label; | 920 return label; |
| 920 } | 921 } |
| 921 | 922 |
| 922 void NetworkStateListDetailedView::RelayoutScrollList() { | 923 void NetworkStateListDetailedView::RelayoutScrollList() { |
| 923 scroller()->Layout(); | 924 scroller()->Layout(); |
| 924 } | 925 } |
| 925 | 926 |
| 926 } // namespace tray | 927 } // namespace tray |
| 927 } // namespace ash | 928 } // namespace ash |
| OLD | NEW |