diff options
author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-28 20:28:26 +0000 |
---|---|---|
committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-28 20:28:26 +0000 |
commit | 8557da6bd5eaef6a20be0a23834dd05bd66fc24d (patch) | |
tree | 80efb129b18fe8616bde4ce283304bb4dcf88a28 /device/bluetooth | |
parent | 5229175a5c9342c93806f0ac97cf45ce1cbe4bc2 (diff) | |
download | chromium_src-8557da6bd5eaef6a20be0a23834dd05bd66fc24d.zip chromium_src-8557da6bd5eaef6a20be0a23834dd05bd66fc24d.tar.gz chromium_src-8557da6bd5eaef6a20be0a23834dd05bd66fc24d.tar.bz2 |
Replace kChromeOSReleaseBoard with SysInfo::GetLsbReleaseBoard()
BUG=126732
Review URL: https://codereview.chromium.org/32043003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@231396 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'device/bluetooth')
-rw-r--r-- | device/bluetooth/bluetooth_adapter_chromeos.cc | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/device/bluetooth/bluetooth_adapter_chromeos.cc b/device/bluetooth/bluetooth_adapter_chromeos.cc index b5f6ba0..319a6e9 100644 --- a/device/bluetooth/bluetooth_adapter_chromeos.cc +++ b/device/bluetooth/bluetooth_adapter_chromeos.cc @@ -7,10 +7,9 @@ #include <string> #include "base/bind.h" -#include "base/command_line.h" #include "base/logging.h" #include "base/metrics/histogram.h" -#include "chromeos/chromeos_switches.h" +#include "base/sys_info.h" #include "chromeos/dbus/bluetooth_adapter_client.h" #include "chromeos/dbus/bluetooth_device_client.h" #include "chromeos/dbus/bluetooth_input_client.h" @@ -328,16 +327,7 @@ void BluetoothAdapterChromeOS::SetAdapter(const dbus::ObjectPath& object_path) { } void BluetoothAdapterChromeOS::SetAdapterName() { - // Set a better name for the adapter than "BlueZ 5.x"; this isn't an ideal - // way to do this but it'll do for now. See http://crbug.com/126732 and - // http://crbug.com/126802. - std::string board; - const CommandLine* command_line = CommandLine::ForCurrentProcess(); - if (command_line->HasSwitch(chromeos::switches::kChromeOSReleaseBoard)) { - board = command_line-> - GetSwitchValueASCII(chromeos::switches::kChromeOSReleaseBoard); - } - + std::string board = base::SysInfo::GetLsbReleaseBoard(); std::string alias; if (board.substr(0, 6) == "stumpy") { alias = "Chromebox"; |