chrome/browser/resources/chromeos/network_ui/network_ui.html - Issue 289383004: Merge FavoriteState into NetworkState

Side by Side Diff: chrome/browser/resources/chromeos/network_ui/network_ui.html

Issue 289383004: Merge FavoriteState into NetworkState (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 6 years, 6 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/extensions/api/networking_private/networking_private_event_router_chromeos.cc ('k') | chrome/browser/resources/chromeos/network_ui/network_ui.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <!DOCTYPE HTML>	1 <!DOCTYPE HTML>

2 <html i18n-values="dir:textdirection;">	2 <html i18n-values="dir:textdirection;">

3 <head>	3 <head>

4 <meta charset="utf-8">	4 <meta charset="utf-8">

5 <title id="network" i18n-content="titleText"></title>	5 <title id="network" i18n-content="titleText"></title>

6 <link rel="stylesheet" href="chrome://network/network_ui.css">	6 <link rel="stylesheet" href="chrome://network/network_ui.css">

7 <script src="chrome://resources/js/load_time_data.js"></script>	7 <script src="chrome://resources/js/load_time_data.js"></script>

8 <script src="chrome://resources/js/util.js"></script>	8 <script src="chrome://resources/js/util.js"></script>

9 <script src="chrome://network/strings.js"></script>	9 <script src="chrome://network/strings.js"></script>

10 <script src="chrome://network/network_config.js"></script>	10 <script src="chrome://network/network_config.js"></script>

(...skipping 13 matching lines...) Expand all Loading...
24 <label for="log-event" i18n-content="logLevelEventText"></label>	24 <label for="log-event" i18n-content="logLevelEventText"></label>

25 <input id="log-debug" type="checkbox">	25 <input id="log-debug" type="checkbox">

26 <label for="log-debug" i18n-content="logLevelDebugText"></label>	26 <label for="log-debug" i18n-content="logLevelDebugText"></label>

27 <input id="log-fileinfo" type="checkbox">	27 <input id="log-fileinfo" type="checkbox">

28 <label for="log-fileinfo" i18n-content="logLevelFileinfoText"></label>	28 <label for="log-fileinfo" i18n-content="logLevelFileinfoText"></label>

29 <input id="log-timedetail" type="checkbox">	29 <input id="log-timedetail" type="checkbox">

30 <label for="log-timedetail" i18n-content="logLevelTimeDetailText"></label>	30 <label for="log-timedetail" i18n-content="logLevelTimeDetailText"></label>

31 </div>	31 </div>

32 <div id="network-log-container">	32 <div id="network-log-container">

33 </div>	33 </div>

34 <h3>Networks: </h3>	34 <h3>Visible Networks: </h3>

35 <table id="network-state-table" class="state-table">	35 <table id="network-state-table" class="state-table">

36 <tr class="state-table-header">	36 <tr class="state-table-header">

37 <td></td>	37 <td></td>

38 <td>GUID</td>	38 <td>GUID</td>

39 <td>Name</td>	39 <td>Name</td>

40 <td>Type</td>	40 <td>Type</td>

41 <td>State</td>	41 <td>State</td>

42 <td>Error</td>	42 <td>Error</td>

43 <td>Security</td>	43 <td>Security</td>

44 <td>Technology</td>	44 <td>Technology</td>

45 <td>Activation</td>	45 <td>Activation</td>

46 <td>Roaming</td>	46 <td>Roaming</td>

47 <td>OOC</td>	47 <td>OOC</td>

48 <td>Strength</td>	48 <td>Strength</td>

49 </tr>	49 </tr>

50 </table>	50 </table>

51 <h3>Favorites: </h3>	51 <h3>Favorites: </h3>

52 <table id="favorite-state-table" class="state-table">	52 <table id="favorite-state-table" class="state-table">

53 <tr class="state-table-header">	53 <tr class="state-table-header">

54 <td></td>	54 <td></td>

55 <td>GUID</td>	55 <td>GUID</td>

56 <td>Name</td>	56 <td>Name</td>

57 <td>Type</td>	57 <td>Type</td>

58 <td>Profile</td>	58 <td>Profile</td>

	59 <td>Visible</td>

59 <td>ONC Source</td>	60 <td>ONC Source</td>

60 </tr>	61 </tr>

61 </table>	62 </table>

62 <script src="chrome://resources/js/i18n_template2.js"></script>	63 <script src="chrome://resources/js/i18n_template2.js"></script>

63 </body>	64 </body>

64 </html>	65 </html>

OLD	NEW