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

Side by Side 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 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"
11 #include "chrome/browser/extensions/tab_helper.h" 11 #include "chrome/browser/extensions/tab_helper.h"
12 #include "chrome/common/url_constants.h" 12 #include "chrome/common/url_constants.h"
13 #include "chrome/grit/generated_resources.h" 13 #include "chrome/grit/generated_resources.h"
14 #include "chromeos/network/device_state.h" 14 #include "chromeos/network/device_state.h"
15 #include "chromeos/network/network_configuration_handler.h" 15 #include "chromeos/network/network_configuration_handler.h"
16 #include "chromeos/network/network_state.h" 16 #include "chromeos/network/network_state.h"
17 #include "chromeos/network/network_state_handler.h" 17 #include "chromeos/network/network_state_handler.h"
18 #include "components/device_event_log/device_event_log.h" 18 #include "components/device_event_log/device_event_log.h"
19 #include "content/public/browser/web_contents.h" 19 #include "content/public/browser/web_contents.h"
20 #include "content/public/browser/web_ui.h" 20 #include "content/public/browser/web_ui.h"
21 #include "content/public/browser/web_ui_data_source.h" 21 #include "content/public/browser/web_ui_data_source.h"
22 #include "content/public/browser/web_ui_message_handler.h" 22 #include "content/public/browser/web_ui_message_handler.h"
23 #include "grit/browser_resources.h" 23 #include "grit/browser_resources.h"
24 #include "third_party/cros_system_api/dbus/service_constants.h" 24 #include "third_party/cros_system_api/dbus/service_constants.h"
25 #include "ui/chromeos/strings/grit/ui_chromeos_strings.h"
25 26
26 namespace chromeos { 27 namespace chromeos {
27 28
28 namespace { 29 namespace {
29 30
30 bool GetServicePathFromGuid(const std::string& guid, 31 bool GetServicePathFromGuid(const std::string& guid,
31 std::string* service_path) { 32 std::string* service_path) {
32 const NetworkState* network = 33 const NetworkState* network =
33 NetworkHandler::Get()->network_state_handler()->GetNetworkStateFromGuid( 34 NetworkHandler::Get()->network_state_handler()->GetNetworkStateFromGuid(
34 guid); 35 guid);
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 html->AddLocalizedString("clickToExpandText", IDS_NETWORK_UI_EXPAND); 152 html->AddLocalizedString("clickToExpandText", IDS_NETWORK_UI_EXPAND);
152 html->AddLocalizedString("propertyFormatText", 153 html->AddLocalizedString("propertyFormatText",
153 IDS_NETWORK_UI_PROPERTY_FORMAT); 154 IDS_NETWORK_UI_PROPERTY_FORMAT);
154 155
155 html->AddLocalizedString("normalFormatOption", IDS_NETWORK_UI_FORMAT_NORMAL); 156 html->AddLocalizedString("normalFormatOption", IDS_NETWORK_UI_FORMAT_NORMAL);
156 html->AddLocalizedString("managedFormatOption", 157 html->AddLocalizedString("managedFormatOption",
157 IDS_NETWORK_UI_FORMAT_MANAGED); 158 IDS_NETWORK_UI_FORMAT_MANAGED);
158 html->AddLocalizedString("stateFormatOption", IDS_NETWORK_UI_FORMAT_STATE); 159 html->AddLocalizedString("stateFormatOption", IDS_NETWORK_UI_FORMAT_STATE);
159 html->AddLocalizedString("shillFormatOption", IDS_NETWORK_UI_FORMAT_SHILL); 160 html->AddLocalizedString("shillFormatOption", IDS_NETWORK_UI_FORMAT_SHILL);
160 161
161 html->AddLocalizedString("defaultNetworkText",
162 IDS_NETWORK_UI_DEFAULT_NETWORK);
163 html->AddLocalizedString("noNetworkText",
164 IDS_STATUSBAR_NO_NETWORKS_MESSAGE);
165 html->AddLocalizedString("visibleNetworksLabel", 162 html->AddLocalizedString("visibleNetworksLabel",
166 IDS_NETWORK_UI_VISIBLE_NETWORKS); 163 IDS_NETWORK_UI_VISIBLE_NETWORKS);
167 html->AddLocalizedString("favoriteNetworksLabel", 164 html->AddLocalizedString("favoriteNetworksLabel",
168 IDS_NETWORK_UI_FAVORITE_NETWORKS); 165 IDS_NETWORK_UI_FAVORITE_NETWORKS);
169 166
167 html->AddLocalizedString("networkConnected",
168 IDS_ASH_STATUS_TRAY_NETWORK_CONNECTED);
169 html->AddLocalizedString("networkConnecting",
170 IDS_ASH_STATUS_TRAY_NETWORK_CONNECTING);
171 html->AddLocalizedString("networkDisabled",
172 IDS_OPTIONS_SETTINGS_NETWORK_DISABLED);
173 html->AddLocalizedString("networkNotConnected",
174 IDS_ASH_STATUS_TRAY_NETWORK_NOT_CONNECTED);
175 html->AddLocalizedString("OncTypeCellular", IDS_NETWORK_TYPE_CELLULAR);
176 html->AddLocalizedString("OncTypeEthernet", IDS_NETWORK_TYPE_ETHERNET);
177 html->AddLocalizedString("OncTypeVPN", IDS_NETWORK_TYPE_VPN);
178 html->AddLocalizedString("OncTypeWiFi", IDS_NETWORK_TYPE_WIFI);
179 html->AddLocalizedString("OncTypeWimax", IDS_NETWORK_TYPE_WIMAX);
180
170 html->SetJsonPath("strings.js"); 181 html->SetJsonPath("strings.js");
171 html->AddResourcePath("network_ui.css", IDR_NETWORK_UI_CSS); 182 html->AddResourcePath("network_ui.css", IDR_NETWORK_UI_CSS);
172 html->AddResourcePath("network_ui.js", IDR_NETWORK_UI_JS); 183 html->AddResourcePath("network_ui.js", IDR_NETWORK_UI_JS);
173 html->SetDefaultResource(IDR_NETWORK_UI_HTML); 184 html->SetDefaultResource(IDR_NETWORK_UI_HTML);
174 185
175 content::WebUIDataSource::Add(web_ui->GetWebContents()->GetBrowserContext(), 186 content::WebUIDataSource::Add(web_ui->GetWebContents()->GetBrowserContext(),
176 html); 187 html);
177 } 188 }
178 189
179 NetworkUI::~NetworkUI() { 190 NetworkUI::~NetworkUI() {
180 } 191 }
181 192
182 } // namespace chromeos 193 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698