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 "chrome/browser/chromeos/cros/network_library_impl_cros.h" | 5 #include "chrome/browser/chromeos/cros/network_library_impl_cros.h" |
6 | 6 |
7 #include <dbus/dbus-glib.h> | 7 #include <dbus/dbus-glib.h> |
8 #include "base/command_line.h" | |
8 #include "base/json/json_writer.h" // for debug output only. | 9 #include "base/json/json_writer.h" // for debug output only. |
9 #include "base/metrics/histogram.h" | 10 #include "base/metrics/histogram.h" |
10 #include "chrome/browser/chromeos/cros/cros_library.h" | 11 #include "chrome/browser/chromeos/cros/cros_library.h" |
11 #include "chrome/browser/chromeos/cros/gvalue_util.h" | 12 #include "chrome/browser/chromeos/cros/gvalue_util.h" |
12 #include "chrome/browser/chromeos/cros/native_network_constants.h" | 13 #include "chrome/browser/chromeos/cros/native_network_constants.h" |
13 #include "chrome/browser/chromeos/cros/native_network_parser.h" | 14 #include "chrome/browser/chromeos/cros/native_network_parser.h" |
14 #include "chrome/browser/chromeos/cros_settings.h" | 15 #include "chrome/browser/chromeos/cros_settings.h" |
15 #include "content/public/browser/browser_thread.h" | 16 #include "content/public/browser/browser_thread.h" |
16 #include "third_party/cros_system_api/dbus/service_constants.h" | 17 #include "third_party/cros_system_api/dbus/service_constants.h" |
17 | 18 |
(...skipping 19 matching lines...) Expand all Loading... | |
37 } | 38 } |
38 | 39 |
39 } // namespace | 40 } // namespace |
40 | 41 |
41 //////////////////////////////////////////////////////////////////////////// | 42 //////////////////////////////////////////////////////////////////////////// |
42 | 43 |
43 NetworkLibraryImplCros::NetworkLibraryImplCros() | 44 NetworkLibraryImplCros::NetworkLibraryImplCros() |
44 : NetworkLibraryImplBase(), | 45 : NetworkLibraryImplBase(), |
45 network_manager_monitor_(NULL), | 46 network_manager_monitor_(NULL), |
46 data_plan_monitor_(NULL) { | 47 data_plan_monitor_(NULL) { |
48 const char kEnableNonLibcrosNetworkFunctions[] = | |
49 "enable-non-libcros-network-functions"; | |
stevenjb
2012/04/12 17:34:36
This should be defined in chrome_switches.h, and s
hashimoto
2012/04/13 05:27:22
I thought we should be as accurate as possible, bu
| |
50 if (CommandLine::ForCurrentProcess()->HasSwitch( | |
51 kEnableNonLibcrosNetworkFunctions)) { | |
52 LOG(INFO) << "Using non Libcros network fucntions."; | |
53 EnableNonLibcrosNetworkFunctions(true); | |
54 } | |
47 } | 55 } |
48 | 56 |
49 NetworkLibraryImplCros::~NetworkLibraryImplCros() { | 57 NetworkLibraryImplCros::~NetworkLibraryImplCros() { |
50 if (network_manager_monitor_) | 58 if (network_manager_monitor_) |
51 CrosDisconnectNetworkPropertiesMonitor(network_manager_monitor_); | 59 CrosDisconnectNetworkPropertiesMonitor(network_manager_monitor_); |
52 if (data_plan_monitor_) | 60 if (data_plan_monitor_) |
53 CrosDisconnectDataPlanUpdateMonitor(data_plan_monitor_); | 61 CrosDisconnectDataPlanUpdateMonitor(data_plan_monitor_); |
54 for (NetworkPropertiesMonitorMap::iterator iter = | 62 for (NetworkPropertiesMonitorMap::iterator iter = |
55 montitored_networks_.begin(); | 63 montitored_networks_.begin(); |
56 iter != montitored_networks_.end(); ++iter) { | 64 iter != montitored_networks_.end(); ++iter) { |
(...skipping 1274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1331 // Switch back to signed settings value. | 1339 // Switch back to signed settings value. |
1332 SetCellularDataRoamingAllowed(settings_value); | 1340 SetCellularDataRoamingAllowed(settings_value); |
1333 } | 1341 } |
1334 } | 1342 } |
1335 } | 1343 } |
1336 NotifyNetworkManagerChanged(false); // Not forced. | 1344 NotifyNetworkManagerChanged(false); // Not forced. |
1337 AddNetworkDeviceObserver(device_path, network_device_observer_.get()); | 1345 AddNetworkDeviceObserver(device_path, network_device_observer_.get()); |
1338 } | 1346 } |
1339 | 1347 |
1340 } // namespace chromeos | 1348 } // namespace chromeos |
OLD | NEW |