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

Side by Side Diff: chrome/browser/ui/webui/options2/chromeos/internet_options_handler2.cc

Issue 9442027: Add header to network details dialog. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add copyright notice. Created 8 years, 9 months 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/resources/options2/options.html ('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) 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/options2/chromeos/internet_options_handler2.h" 5 #include "chrome/browser/ui/webui/options2/chromeos/internet_options_handler2.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 802 matching lines...) Expand 10 before | Expand all | Expand 10 after
813 chromeos::NetworkPropertyUIData ipconfig_static_ui_data(ui_data); 813 chromeos::NetworkPropertyUIData ipconfig_static_ui_data(ui_data);
814 SetValueDictionary(&dictionary, "ipconfigStatic", ipconfig_static.release(), 814 SetValueDictionary(&dictionary, "ipconfigStatic", ipconfig_static.release(),
815 ipconfig_static_ui_data); 815 ipconfig_static_ui_data);
816 816
817 chromeos::ConnectionType type = network->type(); 817 chromeos::ConnectionType type = network->type();
818 dictionary.SetInteger("type", type); 818 dictionary.SetInteger("type", type);
819 dictionary.SetString("servicePath", network->service_path()); 819 dictionary.SetString("servicePath", network->service_path());
820 dictionary.SetBoolean("connecting", network->connecting()); 820 dictionary.SetBoolean("connecting", network->connecting());
821 dictionary.SetBoolean("connected", network->connected()); 821 dictionary.SetBoolean("connected", network->connected());
822 dictionary.SetString("connectionState", network->GetStateString()); 822 dictionary.SetString("connectionState", network->GetStateString());
823 dictionary.SetString("networkName", network->name());
823 824
824 // Only show proxy for remembered networks. 825 // Only show proxy for remembered networks.
825 chromeos::NetworkProfileType network_profile = network->profile_type(); 826 chromeos::NetworkProfileType network_profile = network->profile_type();
826 dictionary.SetBoolean("showProxy", network_profile != chromeos::PROFILE_NONE); 827 dictionary.SetBoolean("showProxy", network_profile != chromeos::PROFILE_NONE);
827 828
828 // Hide the dhcp/static radio if not ethernet or wifi (or if not enabled) 829 // Hide the dhcp/static radio if not ethernet or wifi (or if not enabled)
829 bool staticIPConfig = CommandLine::ForCurrentProcess()->HasSwitch( 830 bool staticIPConfig = CommandLine::ForCurrentProcess()->HasSwitch(
830 switches::kEnableStaticIPConfig); 831 switches::kEnableStaticIPConfig);
831 dictionary.SetBoolean("showStaticIPConfig", staticIPConfig && 832 dictionary.SetBoolean("showStaticIPConfig", staticIPConfig &&
832 (type == chromeos::TYPE_WIFI || type == chromeos::TYPE_ETHERNET)); 833 (type == chromeos::TYPE_WIFI || type == chromeos::TYPE_ETHERNET));
(...skipping 464 matching lines...) Expand 10 before | Expand all | Expand 10 after
1297 if (default_value) 1298 if (default_value)
1298 value_dict->Set("default", default_value->DeepCopy()); 1299 value_dict->Set("default", default_value->DeepCopy());
1299 if (ui_data.managed()) 1300 if (ui_data.managed())
1300 value_dict->SetString("controlledBy", "policy"); 1301 value_dict->SetString("controlledBy", "policy");
1301 else if (ui_data.recommended()) 1302 else if (ui_data.recommended())
1302 value_dict->SetString("controlledBy", "recommended"); 1303 value_dict->SetString("controlledBy", "recommended");
1303 settings->Set(key, value_dict); 1304 settings->Set(key, value_dict);
1304 } 1305 }
1305 1306
1306 } // namespace options2 1307 } // namespace options2
OLDNEW
« no previous file with comments | « chrome/browser/resources/options2/options.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698