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

Side by Side 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 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/network_dropdown.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/chromeos/login/network_dropdown_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "chrome/browser/chromeos/login/webui_login_display.h" 9 #include "chrome/browser/chromeos/login/webui_login_display.h"
10 #include "chrome/browser/ui/webui/chromeos/login/network_dropdown.h" 10 #include "chrome/browser/ui/webui/chromeos/login/network_dropdown.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 DCHECK(args->GetSize() == 1); 59 DCHECK(args->GetSize() == 1);
60 double id; 60 double id;
61 if (!args->GetDouble(0, &id)) 61 if (!args->GetDouble(0, &id))
62 NOTREACHED(); 62 NOTREACHED();
63 DCHECK(dropdown_.get()); 63 DCHECK(dropdown_.get());
64 dropdown_->OnItemChosen(static_cast<int>(id)); 64 dropdown_->OnItemChosen(static_cast<int>(id));
65 } 65 }
66 66
67 void NetworkDropdownHandler::HandleNetworkDropdownShow( 67 void NetworkDropdownHandler::HandleNetworkDropdownShow(
68 const base::ListValue* args) { 68 const base::ListValue* args) {
69 DCHECK(args->GetSize() == 1); 69 DCHECK(args->GetSize() == 2);
70 std::string element_id; 70 std::string element_id;
71 if (!args->GetString(0, &element_id)) 71 if (!args->GetString(0, &element_id))
72 NOTREACHED(); 72 NOTREACHED();
73 bool oobe;
74 if (!args->GetBoolean(1, &oobe))
75 NOTREACHED();
73 76
74 dropdown_.reset(new NetworkDropdown(web_ui_, GetNativeWindow())); 77 dropdown_.reset(new NetworkDropdown(web_ui_, GetNativeWindow(), oobe));
75 } 78 }
76 79
77 void NetworkDropdownHandler::HandleNetworkDropdownHide( 80 void NetworkDropdownHandler::HandleNetworkDropdownHide(
78 const base::ListValue* args) { 81 const base::ListValue* args) {
79 DCHECK(args->GetSize() == 0); 82 DCHECK(args->GetSize() == 0);
80 dropdown_.reset(); 83 dropdown_.reset();
81 } 84 }
82 85
83 void NetworkDropdownHandler::HandleNetworkDropdownRefresh( 86 void NetworkDropdownHandler::HandleNetworkDropdownRefresh(
84 const base::ListValue* args) { 87 const base::ListValue* args) {
85 DCHECK(args->GetSize() == 0); 88 DCHECK(args->GetSize() == 0);
86 // Since language change is async, 89 // Since language change is async,
87 // we may in theory be on another screen during this call. 90 // we may in theory be on another screen during this call.
88 if (dropdown_.get()) 91 if (dropdown_.get())
89 dropdown_->Refresh(); 92 dropdown_->Refresh();
90 } 93 }
91 94
92 } // namespace chromeos 95 } // namespace chromeos
OLDNEW
« 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