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

Unified Diff: chrome/browser/resources/chromeos/network_ui/network_ui.html

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, 10 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
Index: chrome/browser/resources/chromeos/network_ui/network_ui.html
diff --git a/chrome/browser/resources/chromeos/network_ui/network_ui.html b/chrome/browser/resources/chromeos/network_ui/network_ui.html
index 83135d604bc28794a5436c553e9ad3a9e7ba135c..62ba811ceb8a96f2275b7e1314216be6f0d89b76 100644
--- a/chrome/browser/resources/chromeos/network_ui/network_ui.html
+++ b/chrome/browser/resources/chromeos/network_ui/network_ui.html
@@ -1,15 +1,21 @@
<!doctype html>
<html i18n-values="dir:textdirection;lang:language">
+
<head>
<meta charset="utf-8">
<title id="network" i18n-content="titleText"></title>
<link rel="stylesheet" href="chrome://resources/css/text_defaults.css">
- <link rel="stylesheet" href="chrome://network/network_ui.css">
+ <link rel="stylesheet" href="chrome://network/network_ui.css">
+ <link rel="import" href="chrome://resources/cr_elements/cr_network_icon/cr_network_icon.html">
+ <link rel="import" href="chrome://resources/cr_elements/cr_onc/cr_onc_data.html">
+ <link rel="import" href="chrome://resources/polymer/paper-button/paper-button.html">
+
<script src="chrome://resources/js/load_time_data.js"></script>
<script src="chrome://resources/js/util.js"></script>
<script src="chrome://network/strings.js"></script>
<script src="chrome://network/network_ui.js"></script>
</head>
+
<body>
<div id="header">
<p i18n-content="autoRefreshText"></p>
@@ -23,13 +29,24 @@
<option value="shill" i18n-content="shillFormatOption"></option>
</select>
</div>
- <p><button id="refresh" i18n-content="networkRefreshText"></button></p>
+
+ <div id="default-network">
+ <cr-network-icon id="default-network-icon"></cr-network-icon>
+ <span id="default-network-text"></span>
+ </div>
+
+ <div>
+ <paper-button raised class="colored" id="refresh"
+ i18n-content="networkRefreshText">
+ </paper-button>
+ </div>
</div>
<h3 i18n-content="visibleNetworksLabel"></h3>
<table id="network-state-table" class="state-table">
<tr class="state-table-header">
<td></td>
+ <td></td>
<td>GUID</td>
<td>Path</td>
<td>Name</td>
@@ -50,6 +67,7 @@
<table id="favorite-state-table" class="state-table">
<tr class="state-table-header">
<td></td>
+ <td></td>
<td>GUID</td>
<td>Path</td>
<td>Name</td>

Powered by Google App Engine
This is Rietveld 408576698