OLD | NEW |
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/options/chromeos/internet_options_handler.h" | 5 #include "chrome/browser/ui/webui/options/chromeos/internet_options_handler.h" |
6 | 6 |
7 #include <ctype.h> | 7 #include <ctype.h> |
8 | 8 |
9 #include <map> | 9 #include <map> |
10 #include <string> | 10 #include <string> |
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
182 set_icon( | 182 set_icon( |
183 chromeos::NetworkMenuIcon::GetBitmap(network ? network : remembered)); | 183 chromeos::NetworkMenuIcon::GetBitmap(network ? network : remembered)); |
184 set_name(remembered->name()); | 184 set_name(remembered->name()); |
185 set_connecting(network ? network->connecting() : false); | 185 set_connecting(network ? network->connecting() : false); |
186 set_connected(network ? network->connected() : false); | 186 set_connected(network ? network->connected() : false); |
187 set_connectable(true); | 187 set_connectable(true); |
188 set_connection_type(remembered->type()); | 188 set_connection_type(remembered->type()); |
189 set_remembered(true); | 189 set_remembered(true); |
190 set_shared(remembered->profile_type() == chromeos::PROFILE_SHARED); | 190 set_shared(remembered->profile_type() == chromeos::PROFILE_SHARED); |
191 set_needs_new_plan(false); | 191 set_needs_new_plan(false); |
192 set_policy_managed( | 192 set_policy_managed(chromeos::NetworkUIData::IsManaged(remembered)); |
193 network ? chromeos::NetworkUIData::IsManaged(network) : false); | |
194 } | 193 } |
195 | 194 |
196 DictionaryValue* NetworkInfoDictionary::BuildDictionary() { | 195 DictionaryValue* NetworkInfoDictionary::BuildDictionary() { |
197 std::string status; | 196 std::string status; |
198 | 197 |
199 if (remembered_) { | 198 if (remembered_) { |
200 if (shared_) | 199 if (shared_) |
201 status = l10n_util::GetStringUTF8(IDS_OPTIONS_SETTINGS_SHARED_NETWORK); | 200 status = l10n_util::GetStringUTF8(IDS_OPTIONS_SETTINGS_SHARED_NETWORK); |
202 } else { | 201 } else { |
203 // 802.1X networks can be connected but not have saved credentials, and | 202 // 802.1X networks can be connected but not have saved credentials, and |
(...skipping 1159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1363 value_dict->Set("value", value); | 1362 value_dict->Set("value", value); |
1364 const base::Value* default_value = ui_data.default_value(); | 1363 const base::Value* default_value = ui_data.default_value(); |
1365 if (default_value) | 1364 if (default_value) |
1366 value_dict->Set("default", default_value->DeepCopy()); | 1365 value_dict->Set("default", default_value->DeepCopy()); |
1367 if (ui_data.managed()) | 1366 if (ui_data.managed()) |
1368 value_dict->SetString("controlledBy", "policy"); | 1367 value_dict->SetString("controlledBy", "policy"); |
1369 else if (ui_data.recommended()) | 1368 else if (ui_data.recommended()) |
1370 value_dict->SetString("controlledBy", "recommended"); | 1369 value_dict->SetString("controlledBy", "recommended"); |
1371 settings->Set(key, value_dict); | 1370 settings->Set(key, value_dict); |
1372 } | 1371 } |
OLD | NEW |