Chromium Code Reviews| 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/ui/webui/about_ui.h" | 5 #include "chrome/browser/ui/webui/about_ui.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 362 WrapWithTH("State"); | 362 WrapWithTH("State"); |
| 363 if (network->type() == chromeos::TYPE_WIFI || | 363 if (network->type() == chromeos::TYPE_WIFI || |
| 364 network->type() == chromeos::TYPE_CELLULAR) { | 364 network->type() == chromeos::TYPE_CELLULAR) { |
| 365 str += WrapWithTH("Auto-Connect"); | 365 str += WrapWithTH("Auto-Connect"); |
| 366 str += WrapWithTH("Strength"); | 366 str += WrapWithTH("Strength"); |
| 367 } | 367 } |
| 368 if (network->type() == chromeos::TYPE_WIFI) { | 368 if (network->type() == chromeos::TYPE_WIFI) { |
| 369 str += WrapWithTH("Encryption"); | 369 str += WrapWithTH("Encryption"); |
| 370 str += WrapWithTH("Passphrase"); | 370 str += WrapWithTH("Passphrase"); |
| 371 str += WrapWithTH("Identity"); | 371 str += WrapWithTH("Identity"); |
| 372 str += WrapWithTH("Frequency"); | |
|
Paul Stewart
2012/05/17 19:19:22
If you're still not submitted, I'd lobby for this
| |
| 372 } | 373 } |
| 373 if (network->type() == chromeos::TYPE_CELLULAR) { | 374 if (network->type() == chromeos::TYPE_CELLULAR) { |
| 374 str += WrapWithTH("Technology"); | 375 str += WrapWithTH("Technology"); |
| 375 str += WrapWithTH("Connectivity"); | 376 str += WrapWithTH("Connectivity"); |
| 376 str += WrapWithTH("Activation"); | 377 str += WrapWithTH("Activation"); |
| 377 str += WrapWithTH("Roaming"); | 378 str += WrapWithTH("Roaming"); |
| 378 } | 379 } |
| 379 if (network->type() == chromeos::TYPE_VPN) { | 380 if (network->type() == chromeos::TYPE_VPN) { |
| 380 str += WrapWithTH("Host"); | 381 str += WrapWithTH("Host"); |
| 381 str += WrapWithTH("Provider Type"); | 382 str += WrapWithTH("Provider Type"); |
| (...skipping 18 matching lines...) Expand all Loading... | |
| 400 static_cast<const chromeos::WirelessNetwork*>(network); | 401 static_cast<const chromeos::WirelessNetwork*>(network); |
| 401 str += WrapWithTD(base::IntToString(wireless->auto_connect())); | 402 str += WrapWithTD(base::IntToString(wireless->auto_connect())); |
| 402 str += WrapWithTD(base::IntToString(wireless->strength())); | 403 str += WrapWithTD(base::IntToString(wireless->strength())); |
| 403 } | 404 } |
| 404 if (network->type() == chromeos::TYPE_WIFI) { | 405 if (network->type() == chromeos::TYPE_WIFI) { |
| 405 const chromeos::WifiNetwork* wifi = | 406 const chromeos::WifiNetwork* wifi = |
| 406 static_cast<const chromeos::WifiNetwork*>(network); | 407 static_cast<const chromeos::WifiNetwork*>(network); |
| 407 str += WrapWithTD(wifi->GetEncryptionString()); | 408 str += WrapWithTD(wifi->GetEncryptionString()); |
| 408 str += WrapWithTD(std::string(wifi->passphrase().length(), '*')); | 409 str += WrapWithTD(std::string(wifi->passphrase().length(), '*')); |
| 409 str += WrapWithTD(wifi->identity()); | 410 str += WrapWithTD(wifi->identity()); |
| 411 str += WrapWithTD(base::IntToString(wifi->frequency())); | |
| 410 } | 412 } |
| 411 if (network->type() == chromeos::TYPE_CELLULAR) { | 413 if (network->type() == chromeos::TYPE_CELLULAR) { |
| 412 const chromeos::CellularNetwork* cell = | 414 const chromeos::CellularNetwork* cell = |
| 413 static_cast<const chromeos::CellularNetwork*>(network); | 415 static_cast<const chromeos::CellularNetwork*>(network); |
| 414 str += WrapWithTH(cell->GetNetworkTechnologyString()); | 416 str += WrapWithTH(cell->GetNetworkTechnologyString()); |
| 415 str += WrapWithTH(cell->GetActivationStateString()); | 417 str += WrapWithTH(cell->GetActivationStateString()); |
| 416 str += WrapWithTH(cell->GetRoamingStateString()); | 418 str += WrapWithTH(cell->GetRoamingStateString()); |
| 417 } | 419 } |
| 418 if (network->type() == chromeos::TYPE_VPN) { | 420 if (network->type() == chromeos::TYPE_VPN) { |
| 419 const chromeos::VirtualNetwork* vpn = | 421 const chromeos::VirtualNetwork* vpn = |
| (...skipping 1047 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1467 | 1469 |
| 1468 AboutUI::AboutUI(content::WebUI* web_ui, const std::string& name) | 1470 AboutUI::AboutUI(content::WebUI* web_ui, const std::string& name) |
| 1469 : WebUIController(web_ui) { | 1471 : WebUIController(web_ui) { |
| 1470 Profile* profile = Profile::FromWebUI(web_ui); | 1472 Profile* profile = Profile::FromWebUI(web_ui); |
| 1471 ChromeURLDataManager::DataSource* source = | 1473 ChromeURLDataManager::DataSource* source = |
| 1472 new AboutUIHTMLSource(name, profile); | 1474 new AboutUIHTMLSource(name, profile); |
| 1473 if (source) { | 1475 if (source) { |
| 1474 ChromeURLDataManager::AddDataSource(profile, source); | 1476 ChromeURLDataManager::AddDataSource(profile, source); |
| 1475 } | 1477 } |
| 1476 } | 1478 } |
| OLD | NEW |