OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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_connect.h" | 5 #include "ash/system/chromeos/network/network_connect.h" |
6 | 6 |
7 #include "ash/session/session_state_delegate.h" | 7 #include "ash/session/session_state_delegate.h" |
8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
9 #include "ash/system/chromeos/network/network_state_notifier.h" | 9 #include "ash/system/chromeos/network/network_state_notifier.h" |
10 #include "ash/system/system_notifier.h" | 10 #include "ash/system/system_notifier.h" |
11 #include "ash/system/tray/system_tray_delegate.h" | 11 #include "ash/system/tray/system_tray_delegate.h" |
12 #include "ash/system/tray/system_tray_notifier.h" | 12 #include "ash/system/tray/system_tray_notifier.h" |
13 #include "base/bind.h" | 13 #include "base/bind.h" |
14 #include "base/memory/scoped_ptr.h" | 14 #include "base/memory/scoped_ptr.h" |
15 #include "base/strings/utf_string_conversions.h" | 15 #include "base/strings/utf_string_conversions.h" |
16 #include "base/values.h" | 16 #include "base/values.h" |
17 #include "chromeos/login/login_state.h" | 17 #include "chromeos/login/login_state.h" |
18 #include "chromeos/network/device_state.h" | 18 #include "chromeos/network/device_state.h" |
19 #include "chromeos/network/network_activation_handler.h" | 19 #include "chromeos/network/network_activation_handler.h" |
20 #include "chromeos/network/network_configuration_handler.h" | 20 #include "chromeos/network/network_configuration_handler.h" |
21 #include "chromeos/network/network_connection_handler.h" | 21 #include "chromeos/network/network_connection_handler.h" |
22 #include "chromeos/network/network_event_log.h" | 22 #include "chromeos/network/network_event_log.h" |
23 #include "chromeos/network/network_handler_callbacks.h" | 23 #include "chromeos/network/network_handler_callbacks.h" |
24 #include "chromeos/network/network_profile.h" | 24 #include "chromeos/network/network_profile.h" |
25 #include "chromeos/network/network_profile_handler.h" | 25 #include "chromeos/network/network_profile_handler.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 "chromeos/network/shill_property_util.h" | |
29 #include "grit/ash_resources.h" | 28 #include "grit/ash_resources.h" |
30 #include "grit/ash_strings.h" | 29 #include "grit/ash_strings.h" |
31 #include "third_party/cros_system_api/dbus/service_constants.h" | 30 #include "third_party/cros_system_api/dbus/service_constants.h" |
32 #include "ui/base/l10n/l10n_util.h" | 31 #include "ui/base/l10n/l10n_util.h" |
33 #include "ui/base/resource/resource_bundle.h" | 32 #include "ui/base/resource/resource_bundle.h" |
34 #include "ui/message_center/message_center.h" | 33 #include "ui/message_center/message_center.h" |
35 #include "ui/message_center/notification.h" | 34 #include "ui/message_center/notification.h" |
36 | 35 |
37 using chromeos::DeviceState; | 36 using chromeos::DeviceState; |
38 using chromeos::NetworkConfigurationHandler; | 37 using chromeos::NetworkConfigurationHandler; |
(...skipping 539 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
578 | 577 |
579 void ShowNetworkSettings(const std::string& service_path) { | 578 void ShowNetworkSettings(const std::string& service_path) { |
580 if (!ash::Shell::HasInstance()) | 579 if (!ash::Shell::HasInstance()) |
581 return; | 580 return; |
582 ash::Shell::GetInstance()->system_tray_delegate()->ShowNetworkSettings( | 581 ash::Shell::GetInstance()->system_tray_delegate()->ShowNetworkSettings( |
583 service_path); | 582 service_path); |
584 } | 583 } |
585 | 584 |
586 } // network_connect | 585 } // network_connect |
587 } // ash | 586 } // ash |
OLD | NEW |