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

Unified Diff: chrome/browser/ui/webui/chromeos/login/network_dropdown.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
Index: chrome/browser/ui/webui/chromeos/login/network_dropdown.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc b/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc
index 404d4d610a4c6c3338a6ad7aadf8c4a044789a51..adc9261c4f2fa4273e0376956f623e86e07faa82 100644
--- a/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc
+++ b/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc
@@ -92,9 +92,11 @@ base::ListValue* NetworkMenuWebUI::ConvertMenuModel(ui::MenuModel* model) {
// NetworkDropdown -------------------------------------------------------------
-NetworkDropdown::NetworkDropdown(WebUI* web_ui, gfx::NativeWindow parent_window)
+NetworkDropdown::NetworkDropdown(WebUI* web_ui,
+ gfx::NativeWindow parent_window, bool oobe)
: parent_window_(parent_window),
- web_ui_(web_ui) {
+ web_ui_(web_ui),
+ oobe_(oobe) {
network_menu_.reset(new NetworkMenuWebUI(this, web_ui));
network_icon_.reset(
new NetworkMenuIcon(this, NetworkMenuIcon::DROPDOWN_MODE));
@@ -128,7 +130,7 @@ void NetworkDropdown::OpenButtonOptions() {
}
bool NetworkDropdown::ShouldOpenButtonOptions() const {
- return false;
+ return !oobe_;
}
void NetworkDropdown::OnNetworkManagerChanged(NetworkLibrary* cros) {

Powered by Google App Engine
This is Rietveld 408576698