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

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

Issue 9860031: Indicate in network menu if command is for activating a cellular network. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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/chromeos/network_list.js ('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 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 { "preferredNetworksPage", IDS_OPTIONS_SETTINGS_PREFERRED_NETWORKS_TITLE }, 295 { "preferredNetworksPage", IDS_OPTIONS_SETTINGS_PREFERRED_NETWORKS_TITLE },
296 { "useSharedProxies", IDS_OPTIONS_SETTINGS_USE_SHARED_PROXIES }, 296 { "useSharedProxies", IDS_OPTIONS_SETTINGS_USE_SHARED_PROXIES },
297 { "addConnectionTitle", 297 { "addConnectionTitle",
298 IDS_OPTIONS_SETTINGS_SECTION_TITLE_ADD_CONNECTION }, 298 IDS_OPTIONS_SETTINGS_SECTION_TITLE_ADD_CONNECTION },
299 { "addConnectionWifi", IDS_OPTIONS_SETTINGS_ADD_CONNECTION_WIFI }, 299 { "addConnectionWifi", IDS_OPTIONS_SETTINGS_ADD_CONNECTION_WIFI },
300 { "addConnectionVPN", IDS_STATUSBAR_NETWORK_ADD_VPN }, 300 { "addConnectionVPN", IDS_STATUSBAR_NETWORK_ADD_VPN },
301 { "enableDataRoaming", IDS_OPTIONS_SETTINGS_ENABLE_DATA_ROAMING }, 301 { "enableDataRoaming", IDS_OPTIONS_SETTINGS_ENABLE_DATA_ROAMING },
302 { "disableDataRoaming", IDS_OPTIONS_SETTINGS_DISABLE_DATA_ROAMING }, 302 { "disableDataRoaming", IDS_OPTIONS_SETTINGS_DISABLE_DATA_ROAMING },
303 { "dataRoamingDisableToggleTooltip", 303 { "dataRoamingDisableToggleTooltip",
304 IDS_OPTIONS_SETTINGS_TOGGLE_DATA_ROAMING_RESTRICTION }, 304 IDS_OPTIONS_SETTINGS_TOGGLE_DATA_ROAMING_RESTRICTION },
305 { "activateNetwork", IDS_STATUSBAR_NETWORK_DEVICE_ACTIVATE },
305 306
306 // Network options dialog labels. 307 // Network options dialog labels.
307 // TODO(kevers): Remove once dialog is deprecated. 308 // TODO(kevers): Remove once dialog is deprecated.
308 309
309 { "wired_title", IDS_OPTIONS_SETTINGS_SECTION_TITLE_WIRED_NETWORK }, 310 { "wired_title", IDS_OPTIONS_SETTINGS_SECTION_TITLE_WIRED_NETWORK },
310 { "wireless_title", IDS_OPTIONS_SETTINGS_SECTION_TITLE_WIRELESS_NETWORK }, 311 { "wireless_title", IDS_OPTIONS_SETTINGS_SECTION_TITLE_WIRELESS_NETWORK },
311 { "vpn_title", IDS_OPTIONS_SETTINGS_SECTION_TITLE_VIRTUAL_NETWORK }, 312 { "vpn_title", IDS_OPTIONS_SETTINGS_SECTION_TITLE_VIRTUAL_NETWORK },
312 { "remembered_title", 313 { "remembered_title",
313 IDS_OPTIONS_SETTINGS_SECTION_TITLE_REMEMBERED_NETWORK }, 314 IDS_OPTIONS_SETTINGS_SECTION_TITLE_REMEMBERED_NETWORK },
314 { "connect_button", IDS_OPTIONS_SETTINGS_CONNECT }, 315 { "connect_button", IDS_OPTIONS_SETTINGS_CONNECT },
(...skipping 989 matching lines...) Expand 10 before | Expand all | Expand 10 after
1304 if (default_value) 1305 if (default_value)
1305 value_dict->Set("default", default_value->DeepCopy()); 1306 value_dict->Set("default", default_value->DeepCopy());
1306 if (ui_data.managed()) 1307 if (ui_data.managed())
1307 value_dict->SetString("controlledBy", "policy"); 1308 value_dict->SetString("controlledBy", "policy");
1308 else if (ui_data.recommended()) 1309 else if (ui_data.recommended())
1309 value_dict->SetString("controlledBy", "recommended"); 1310 value_dict->SetString("controlledBy", "recommended");
1310 settings->Set(key, value_dict); 1311 settings->Set(key, value_dict);
1311 } 1312 }
1312 1313
1313 } // namespace options2 1314 } // namespace options2
OLDNEW
« no previous file with comments | « chrome/browser/resources/options2/chromeos/network_list.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698