chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc - Issue 285233008: Add MacAddress to ONC and networkingPrivate

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc

Issue 285233008: Add MacAddress to ONC and networkingPrivate (Closed) Base URL: https://chromium.googlesource.com/chromium/src

Patch Set: Rebase Created 6 years, 7 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 | « chrome/browser/extensions/api/networking_private/networking_private_apitest.cc ('k') | chrome/test/data/extensions/api_test/networking/test.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc

diff --git a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc

index 098bbb1d58a839f21599ae0889427b88fe69bc87..c31aaf6801f0288c2f6134585b9e3bff5cd314fe 100644

--- a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc

+++ b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc

@@ -1524,8 +1524,11 @@ void InternetOptionsHandler::PopulateDictionaryDetailsCallback(

// Device hardware address

const DeviceState* device = NetworkHandler::Get()->network_state_handler()->

GetDeviceState(network->device_path());

- if (device)

- dictionary.SetString(kTagHardwareAddress, device->GetFormattedMacAddress());

+ if (device) {

+ dictionary.SetString(

+ kTagHardwareAddress,

+ network_util::FormattedMacAddress(device->mac_address()));

+ }

// IP config

scoped_ptr<base::DictionaryValue> ipconfig_dhcp(new base::DictionaryValue);