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 "ui/chromeos/network/network_connect.h" |
6 | 6 |
7 #include "ash/system/chromeos/network/network_state_notifier.h" | |
8 #include "base/bind.h" | 7 #include "base/bind.h" |
9 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
10 #include "base/strings/string_util.h" | 9 #include "base/strings/string_util.h" |
11 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
12 #include "base/values.h" | 11 #include "base/values.h" |
13 #include "chromeos/login/login_state.h" | 12 #include "chromeos/login/login_state.h" |
14 #include "chromeos/network/device_state.h" | 13 #include "chromeos/network/device_state.h" |
15 #include "chromeos/network/network_activation_handler.h" | 14 #include "chromeos/network/network_activation_handler.h" |
16 #include "chromeos/network/network_configuration_handler.h" | 15 #include "chromeos/network/network_configuration_handler.h" |
17 #include "chromeos/network/network_connection_handler.h" | 16 #include "chromeos/network/network_connection_handler.h" |
18 #include "chromeos/network/network_event_log.h" | 17 #include "chromeos/network/network_event_log.h" |
19 #include "chromeos/network/network_handler_callbacks.h" | 18 #include "chromeos/network/network_handler_callbacks.h" |
20 #include "chromeos/network/network_profile.h" | 19 #include "chromeos/network/network_profile.h" |
21 #include "chromeos/network/network_profile_handler.h" | 20 #include "chromeos/network/network_profile_handler.h" |
22 #include "chromeos/network/network_state.h" | 21 #include "chromeos/network/network_state.h" |
23 #include "chromeos/network/network_state_handler.h" | 22 #include "chromeos/network/network_state_handler.h" |
24 #include "grit/ash_resources.h" | 23 #include "grit/ui_chromeos_strings.h" |
25 #include "grit/ash_strings.h" | |
26 #include "third_party/cros_system_api/dbus/service_constants.h" | 24 #include "third_party/cros_system_api/dbus/service_constants.h" |
27 #include "ui/base/l10n/l10n_util.h" | 25 #include "ui/base/l10n/l10n_util.h" |
28 #include "ui/base/resource/resource_bundle.h" | 26 #include "ui/base/resource/resource_bundle.h" |
| 27 #include "ui/chromeos/network/network_state_notifier.h" |
29 #include "ui/message_center/message_center.h" | 28 #include "ui/message_center/message_center.h" |
30 #include "ui/message_center/notification.h" | 29 #include "ui/message_center/notification.h" |
31 | 30 |
32 using chromeos::DeviceState; | 31 using chromeos::DeviceState; |
33 using chromeos::NetworkConfigurationHandler; | 32 using chromeos::NetworkConfigurationHandler; |
34 using chromeos::NetworkConnectionHandler; | 33 using chromeos::NetworkConnectionHandler; |
35 using chromeos::NetworkHandler; | 34 using chromeos::NetworkHandler; |
36 using chromeos::NetworkProfile; | 35 using chromeos::NetworkProfile; |
37 using chromeos::NetworkProfileHandler; | 36 using chromeos::NetworkProfileHandler; |
38 using chromeos::NetworkState; | 37 using chromeos::NetworkState; |
39 using chromeos::NetworkStateHandler; | 38 using chromeos::NetworkStateHandler; |
40 using chromeos::NetworkTypePattern; | 39 using chromeos::NetworkTypePattern; |
41 | 40 |
42 namespace ash { | 41 namespace ui { |
43 | 42 |
44 namespace { | 43 namespace { |
45 | 44 |
46 // Returns true for carriers that can be activated through Shill instead of | 45 // Returns true for carriers that can be activated through Shill instead of |
47 // through a WebUI dialog. | 46 // through a WebUI dialog. |
48 bool IsDirectActivatedCarrier(const std::string& carrier) { | 47 bool IsDirectActivatedCarrier(const std::string& carrier) { |
49 if (carrier == shill::kCarrierSprint) | 48 if (carrier == shill::kCarrierSprint) |
50 return true; | 49 return true; |
51 return false; | 50 return false; |
52 } | 51 } |
(...skipping 585 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
638 CHECK(g_network_connect); | 637 CHECK(g_network_connect); |
639 return g_network_connect; | 638 return g_network_connect; |
640 } | 639 } |
641 | 640 |
642 NetworkConnect::NetworkConnect() { | 641 NetworkConnect::NetworkConnect() { |
643 } | 642 } |
644 | 643 |
645 NetworkConnect::~NetworkConnect() { | 644 NetworkConnect::~NetworkConnect() { |
646 } | 645 } |
647 | 646 |
648 } // ash | 647 } // namespace ui |
OLD | NEW |