Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2033)

Unified Diff: device/bluetooth/bluetooth_adapter_chromeos.cc

Issue 32043003: Replace kChromeOSReleaseBoard with SysInfo::GetLsbReleaseBoard() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix DEPS Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chromeos/chromeos_switches.cc ('k') | sync/util/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/bluetooth/bluetooth_adapter_chromeos.cc
diff --git a/device/bluetooth/bluetooth_adapter_chromeos.cc b/device/bluetooth/bluetooth_adapter_chromeos.cc
index b5f6ba04d759d6582cad9f6f400379f17f3a39cd..319a6e99a63348aea5fc79705b9c9605e5d4b981 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";
« no previous file with comments | « chromeos/chromeos_switches.cc ('k') | sync/util/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698