summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui
diff options
context:
space:
mode:
authordilmah@chromium.org <dilmah@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-26 18:09:03 +0000
committerdilmah@chromium.org <dilmah@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-26 18:09:03 +0000
commitc144a32a456ff04ea2240463570ba3d42f9bbe5c (patch)
treeea2ac00aca202444cacee9d8344e5af93a490efa /chrome/browser/ui
parent2313a94de16f758bd296c95a988fd45d601ca5f7 (diff)
downloadchromium_src-c144a32a456ff04ea2240463570ba3d42f9bbe5c.zip
chromium_src-c144a32a456ff04ea2240463570ba3d42f9bbe5c.tar.gz
chromium_src-c144a32a456ff04ea2240463570ba3d42f9bbe5c.tar.bz2
Show hardware addresses for wifi and ethernet networks.
Network menu (in status area button) is modified in following way: In oobe and login screen we add "More..." submenu and show hardware addresses in submenu. In login screen we additionally show proxy settings in this submenu. In browser this menu is unchanged because: (1) we assume that there is no need in those hardware addresses since login was successful. (2) user can see them via other means. We add some methods (GetWifiDevice and GetEthernetDevice) to login_library because we need to obtain hardware addresses for ethernet and wifi even if there is no visible wi-fi networks and if ethernet is disconected. BUG=chromium-os:13010 TEST=Manual Review URL: http://codereview.chromium.org/6899025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83046 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui')
-rw-r--r--chrome/browser/ui/views/about_ipc_dialog.cc2
-rw-r--r--chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc27
2 files changed, 6 insertions, 23 deletions
diff --git a/chrome/browser/ui/views/about_ipc_dialog.cc b/chrome/browser/ui/views/about_ipc_dialog.cc
index 1215473..fb1fdc4 100644
--- a/chrome/browser/ui/views/about_ipc_dialog.cc
+++ b/chrome/browser/ui/views/about_ipc_dialog.cc
@@ -219,7 +219,7 @@ void AboutIPCDialog::RunDialog() {
views::Window::CreateChromeWindow(NULL, gfx::Rect(),
g_active_dialog)->Show();
} else {
- // TOOD(brettw) it would be nice to focus the existing window.
+ // TODO(brettw) it would be nice to focus the existing window.
}
}
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 4992dbc..86b7667 100644
--- a/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc
@@ -46,22 +46,6 @@
static const char kOtherNetworksFakePath[] = "?";
-namespace {
-
-// Format the hardware address like "0011AA22BB33" => "00:11:AA:22:BB:33".
-std::string FormatHardwareAddress(const std::string& address) {
- std::string output;
- for (size_t i = 0; i < address.size(); ++i) {
- if (i != 0 && i % 2 == 0) {
- output.push_back(':');
- }
- output.push_back(toupper(address[i]));
- }
- return output;
-}
-
-} // namespace
-
InternetOptionsHandler::InternetOptionsHandler()
: chromeos::CrosOptionsPageUIHandler(
new chromeos::UserCrosSettingsProvider),
@@ -593,12 +577,11 @@ void InternetOptionsHandler::PopulateDictionaryDetails(
DCHECK(net);
DictionaryValue dictionary;
std::string hardware_address;
- chromeos::NetworkIPConfigVector ipconfigs =
- cros->GetIPConfigs(net->device_path(), &hardware_address);
- if (!hardware_address.empty()) {
- dictionary.SetString("hardwareAddress",
- FormatHardwareAddress(hardware_address));
- }
+ chromeos::NetworkIPConfigVector ipconfigs = cros->GetIPConfigs(
+ net->device_path(), &hardware_address,
+ chromeos::NetworkLibrary::FORMAT_COLON_SEPARATED_HEX);
+ if (!hardware_address.empty())
+ dictionary.SetString("hardwareAddress", hardware_address);
scoped_ptr<ListValue> ipconfig_list(new ListValue());
for (chromeos::NetworkIPConfigVector::const_iterator it = ipconfigs.begin();
it != ipconfigs.end(); ++it) {