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

Unified Diff: chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.cc

Issue 8633012: [cros] Return proxy-settings back to the network menu list for OOBE. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merged Created 9 years, 1 month 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/ui/webui/chromeos/login/network_dropdown.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.cc b/chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.cc
index 7fc122d6c5c3f1fd72aa524383e4579f287a71a8..5c4661030cfd6cbdf9fcd8e0fe78203965965506 100644
--- a/chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.cc
@@ -66,12 +66,15 @@ void NetworkDropdownHandler::HandleNetworkItemChosen(
void NetworkDropdownHandler::HandleNetworkDropdownShow(
const base::ListValue* args) {
- DCHECK(args->GetSize() == 1);
+ DCHECK(args->GetSize() == 2);
std::string element_id;
if (!args->GetString(0, &element_id))
NOTREACHED();
+ bool oobe;
+ if (!args->GetBoolean(1, &oobe))
+ NOTREACHED();
- dropdown_.reset(new NetworkDropdown(web_ui_, GetNativeWindow()));
+ dropdown_.reset(new NetworkDropdown(web_ui_, GetNativeWindow(), oobe));
}
void NetworkDropdownHandler::HandleNetworkDropdownHide(
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/network_dropdown.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698