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

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

Issue 21030006: NetworkState cleanup, pass properties to InitialPropertiesReceived (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/about_network.h" 5 #include "chrome/browser/ui/webui/chromeos/about_network.h"
6 6
7 #include "ash/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/strings/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
10 #include "base/strings/string_tokenizer.h" 10 #include "base/strings/string_tokenizer.h"
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 std::string str = 104 std::string str =
105 WrapWithTD(network->name()) + 105 WrapWithTD(network->name()) +
106 WrapWithTD(network->type()) + 106 WrapWithTD(network->type()) +
107 WrapWithTD(network->connection_state()) + 107 WrapWithTD(network->connection_state()) +
108 WrapWithTD(network->path()) + 108 WrapWithTD(network->path()) +
109 WrapWithTD(network->profile_path()) + 109 WrapWithTD(network->profile_path()) +
110 WrapWithTD(base::IntToString(network->connectable())) + 110 WrapWithTD(base::IntToString(network->connectable())) +
111 WrapWithTD(network->error()) + 111 WrapWithTD(network->error()) +
112 WrapWithTD(network->ip_address()) + 112 WrapWithTD(network->ip_address()) +
113 WrapWithTD(network->security()) + 113 WrapWithTD(network->security()) +
114 WrapWithTD(network->technology()) + 114 WrapWithTD(network->network_technology()) +
115 WrapWithTD(network->activation_state()) + 115 WrapWithTD(network->activation_state()) +
116 WrapWithTD(network->roaming()) + 116 WrapWithTD(network->roaming()) +
117 WrapWithTD(base::IntToString(network->cellular_out_of_credits())) + 117 WrapWithTD(base::IntToString(network->cellular_out_of_credits())) +
118 WrapWithTD(base::IntToString(network->signal_strength())) + 118 WrapWithTD(base::IntToString(network->signal_strength())) +
119 WrapWithTD(base::IntToString(network->auto_connect())) + 119 WrapWithTD(base::IntToString(network->auto_connect())) +
120 WrapWithTD(base::IntToString(network->favorite())) + 120 WrapWithTD(base::IntToString(network->favorite())) +
121 WrapWithTD(base::IntToString(network->priority())); 121 WrapWithTD(base::IntToString(network->priority()));
122 return WrapWithTR(str); 122 return WrapWithTR(str);
123 } 123 }
124 124
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 if (network_event_log::IsInitialized()) 197 if (network_event_log::IsInitialized())
198 output += GetEventLogSection(debug); 198 output += GetEventLogSection(debug);
199 output += GetNetworkStateHtmlInfo(); 199 output += GetNetworkStateHtmlInfo();
200 output += GetFavoriteStateHtmlInfo(); 200 output += GetFavoriteStateHtmlInfo();
201 return output; 201 return output;
202 } 202 }
203 203
204 } // namespace about_ui 204 } // namespace about_ui
205 205
206 } // namespace chromeos 206 } // namespace chromeos
OLDNEW
« no previous file with comments | « ash/system/chromeos/network/network_observer.cc ('k') | chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698