chrome/browser/ui/webui/chromeos/network_ui.cc - Issue 1277223002: Add cr-network-select element for selecting a Chrome OS network

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/chromeos/network_ui.cc

Issue 1277223002: Add cr-network-select element for selecting a Chrome OS network (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@issue_515987_network_configure

Patch Set: Compile fix Created 5 years, 4 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/resources/settings/settings_resources.grd ('k') | chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chromeos/network_ui.cc

diff --git a/chrome/browser/ui/webui/chromeos/network_ui.cc b/chrome/browser/ui/webui/chromeos/network_ui.cc

index 9950a67f9d408b1d8ecb6a8a13e079e73f090589..08d81419bf911b25967f815368979eca26a2f1b7 100644

--- a/chrome/browser/ui/webui/chromeos/network_ui.cc

+++ b/chrome/browser/ui/webui/chromeos/network_ui.cc

@@ -22,6 +22,7 @@

#include "content/public/browser/web_ui_message_handler.h"

#include "grit/browser_resources.h"

#include "third_party/cros_system_api/dbus/service_constants.h"

+#include "ui/chromeos/strings/grit/ui_chromeos_strings.h"

namespace chromeos {

@@ -158,15 +159,25 @@ NetworkUI::NetworkUI(content::WebUI* web_ui)

html->AddLocalizedString("stateFormatOption", IDS_NETWORK_UI_FORMAT_STATE);

html->AddLocalizedString("shillFormatOption", IDS_NETWORK_UI_FORMAT_SHILL);

- html->AddLocalizedString("defaultNetworkText",

- IDS_NETWORK_UI_DEFAULT_NETWORK);

- html->AddLocalizedString("noNetworkText",

- IDS_STATUSBAR_NO_NETWORKS_MESSAGE);

html->AddLocalizedString("visibleNetworksLabel",

IDS_NETWORK_UI_VISIBLE_NETWORKS);

html->AddLocalizedString("favoriteNetworksLabel",

IDS_NETWORK_UI_FAVORITE_NETWORKS);

+ html->AddLocalizedString("networkConnected",

+ IDS_ASH_STATUS_TRAY_NETWORK_CONNECTED);

+ html->AddLocalizedString("networkConnecting",

+ IDS_ASH_STATUS_TRAY_NETWORK_CONNECTING);

+ html->AddLocalizedString("networkDisabled",

+ IDS_OPTIONS_SETTINGS_NETWORK_DISABLED);

+ html->AddLocalizedString("networkNotConnected",

+ IDS_ASH_STATUS_TRAY_NETWORK_NOT_CONNECTED);

+ html->AddLocalizedString("OncTypeCellular", IDS_NETWORK_TYPE_CELLULAR);

+ html->AddLocalizedString("OncTypeEthernet", IDS_NETWORK_TYPE_ETHERNET);

+ html->AddLocalizedString("OncTypeVPN", IDS_NETWORK_TYPE_VPN);

+ html->AddLocalizedString("OncTypeWiFi", IDS_NETWORK_TYPE_WIFI);

+ html->AddLocalizedString("OncTypeWimax", IDS_NETWORK_TYPE_WIMAX);

html->SetJsonPath("strings.js");

html->AddResourcePath("network_ui.css", IDR_NETWORK_UI_CSS);

html->AddResourcePath("network_ui.js", IDR_NETWORK_UI_JS);