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

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

Issue 874283006: Add custom Polymer network icon element (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge fix Created 5 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/network_ui.h" 5 #include "chrome/browser/ui/webui/chromeos/network_ui.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 html->AddLocalizedString("networkRefreshText", IDS_NETWORK_UI_REFRESH); 150 html->AddLocalizedString("networkRefreshText", IDS_NETWORK_UI_REFRESH);
151 html->AddLocalizedString("clickToExpandText", IDS_NETWORK_UI_EXPAND); 151 html->AddLocalizedString("clickToExpandText", IDS_NETWORK_UI_EXPAND);
152 html->AddLocalizedString("propertyFormatText", 152 html->AddLocalizedString("propertyFormatText",
153 IDS_NETWORK_UI_PROPERTY_FORMAT); 153 IDS_NETWORK_UI_PROPERTY_FORMAT);
154 154
155 html->AddLocalizedString("normalFormatOption", IDS_NETWORK_UI_FORMAT_NORMAL); 155 html->AddLocalizedString("normalFormatOption", IDS_NETWORK_UI_FORMAT_NORMAL);
156 html->AddLocalizedString("managedFormatOption", 156 html->AddLocalizedString("managedFormatOption",
157 IDS_NETWORK_UI_FORMAT_MANAGED); 157 IDS_NETWORK_UI_FORMAT_MANAGED);
158 html->AddLocalizedString("shillFormatOption", IDS_NETWORK_UI_FORMAT_SHILL); 158 html->AddLocalizedString("shillFormatOption", IDS_NETWORK_UI_FORMAT_SHILL);
159 159
160 html->AddLocalizedString("defaultNetworkText",
161 IDS_NETWORK_UI_DEFAULT_NETWORK);
162 html->AddLocalizedString("noNetworkText",
163 IDS_STATUSBAR_NO_NETWORKS_MESSAGE);
160 html->AddLocalizedString("visibleNetworksLabel", 164 html->AddLocalizedString("visibleNetworksLabel",
161 IDS_NETWORK_UI_VISIBLE_NETWORKS); 165 IDS_NETWORK_UI_VISIBLE_NETWORKS);
162 html->AddLocalizedString("favoriteNetworksLabel", 166 html->AddLocalizedString("favoriteNetworksLabel",
163 IDS_NETWORK_UI_FAVORITE_NETWORKS); 167 IDS_NETWORK_UI_FAVORITE_NETWORKS);
164 168
165 html->SetJsonPath("strings.js"); 169 html->SetJsonPath("strings.js");
166 html->AddResourcePath("network_ui.css", IDR_NETWORK_UI_CSS); 170 html->AddResourcePath("network_ui.css", IDR_NETWORK_UI_CSS);
167 html->AddResourcePath("network_ui.js", IDR_NETWORK_UI_JS); 171 html->AddResourcePath("network_ui.js", IDR_NETWORK_UI_JS);
168 html->SetDefaultResource(IDR_NETWORK_UI_HTML); 172 html->SetDefaultResource(IDR_NETWORK_UI_HTML);
169 173
170 content::WebUIDataSource::Add(web_ui->GetWebContents()->GetBrowserContext(), 174 content::WebUIDataSource::Add(web_ui->GetWebContents()->GetBrowserContext(),
171 html); 175 html);
172 } 176 }
173 177
174 NetworkUI::~NetworkUI() { 178 NetworkUI::~NetworkUI() {
175 } 179 }
176 180
177 } // namespace chromeos 181 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698