Add LOG_LEVEL_USER to NetworkEventLog

This will make it easier to view user initiated events in the event log.

BUG=none
TBR=gauravsh@chromium.org

Review URL: https://codereview.chromium.org/16237002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203239 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 23 insertions, 10 deletions

diff --git a/chrome/browser/ui/webui/chromeos/about_network.cc b/chrome/browser/ui/webui/chromeos/about_network.cc
index 3f79082..b98f1f3b 100644
--- a/chrome/browser/ui/webui/chromeos/about_network.cc
+++ b/chrome/browser/ui/webui/chromeos/about_network.cc
@@ -83,6 +83,7 @@ std::string NetworkStateToHtmlTableHeader() {
       WrapWithTH("Type") +
       WrapWithTH("State") +
       WrapWithTH("Path") +
+      WrapWithTH("Connect") +
       WrapWithTH("Error") +
       WrapWithTH("IP Addr") +
       WrapWithTH("Security") +
@@ -103,6 +104,7 @@ std::string NetworkStateToHtmlTableRow(const NetworkState* network) {
       WrapWithTD(network->type()) +
       WrapWithTD(network->connection_state()) +
       WrapWithTD(network->path()) +
+      WrapWithTD(base::IntToString(network->connectable())) +
       WrapWithTD(network->error()) +
       WrapWithTD(network->ip_address()) +
       WrapWithTD(network->security()) +
diff --git a/chromeos/network/network_connection_handler.cc b/chromeos/network/network_connection_handler.cc
index d63688e..10f619d 100644
--- a/chromeos/network/network_connection_handler.cc
+++ b/chromeos/network/network_connection_handler.cc
@@ -150,6 +150,7 @@ void NetworkConnectionHandler::ConnectToNetwork(
     const base::Closure& success_callback,
     const network_handler::ErrorCallback& error_callback,
     bool ignore_error_state) {
+  NET_LOG_USER("ConnectToNetwork", service_path);
   const NetworkState* network =
       network_state_handler_->GetNetworkState(service_path);
   if (!network) {
@@ -213,6 +214,7 @@ void NetworkConnectionHandler::DisconnectNetwork(
     const std::string& service_path,
     const base::Closure& success_callback,
     const network_handler::ErrorCallback& error_callback) {
+  NET_LOG_USER("DisconnectNetwork", service_path);
   const NetworkState* network =
       network_state_handler_->GetNetworkState(service_path);
   if (!network) {
diff --git a/chromeos/network/network_event_log.cc b/chromeos/network/network_event_log.cc
index 3fb341c..914a2a5 100644
--- a/chromeos/network/network_event_log.cc
+++ b/chromeos/network/network_event_log.cc
@@ -97,8 +97,10 @@ std::string LogEntry::GetHtmlText(bool show_desc) const {
   std::string text;
   if (log_level == LOG_LEVEL_DEBUG)
     text += "<i>";
-  else if (log_level == LOG_LEVEL_ERROR)
+  else if (log_level == LOG_LEVEL_USER)
     text += "<b>";
+  else if (log_level == LOG_LEVEL_ERROR)
+    text += "<b><i>";
 
   text += event;
   if (show_desc && !description.empty())
@@ -106,8 +108,10 @@ std::string LogEntry::GetHtmlText(bool show_desc) const {
 
   if (log_level == LOG_LEVEL_DEBUG)
     text += "</i>";
-  else if (log_level == LOG_LEVEL_ERROR)
+  else if (log_level == LOG_LEVEL_USER)
     text += "</b>";
+  else if (log_level == LOG_LEVEL_ERROR)
+    text += "</i></b>";
   return text;
 }
 
diff --git a/chromeos/network/network_event_log.h b/chromeos/network/network_event_log.h
index c5addb8..3d47698 100644
--- a/chromeos/network/network_event_log.h
+++ b/chromeos/network/network_event_log.h
@@ -31,8 +31,9 @@ enum StringOrder {
 // Used to set the detail level for logging.
 enum LogLevel {
   LOG_LEVEL_ERROR = 0,
-  LOG_LEVEL_EVENT = 1,
-  LOG_LEVEL_DEBUG = 2
+  LOG_LEVEL_USER = 1,
+  LOG_LEVEL_EVENT = 2,
+  LOG_LEVEL_DEBUG = 3
 };
 
 // Default log level.
@@ -93,7 +94,11 @@ CHROMEOS_EXPORT std::string ValueAsString(const base::Value& value);
 #define NET_LOG_ERROR(event, desc) NET_LOG_LEVEL(                       \
     ::chromeos::network_event_log::LOG_LEVEL_ERROR, event, desc)
 
-// Important events, e.g. connection request
+// User initiated events, e.g. connection request
+#define NET_LOG_USER(event, desc) NET_LOG_LEVEL(                        \
+    ::chromeos::network_event_log::LOG_LEVEL_USER, event, desc)
+
+// Important events, e.g. state updates
 #define NET_LOG_EVENT(event, desc) NET_LOG_LEVEL(                       \
     ::chromeos::network_event_log::LOG_LEVEL_EVENT, event, desc)
 
diff --git a/chromeos/network/network_event_log_unittest.cc b/chromeos/network/network_event_log_unittest.cc
index 28a0572..5139e46 100644
--- a/chromeos/network/network_event_log_unittest.cc
+++ b/chromeos/network/network_event_log_unittest.cc
@@ -128,7 +128,7 @@ TEST_F(NetworkEventLogTest, TestStringFormat) {
       OLDEST_FIRST, "desc", kDefaultLevel, 1));
   EXPECT_EQ("event0\n", network_event_log::GetAsString(
       OLDEST_FIRST, "", kDefaultLevel, 1));
-  EXPECT_EQ("<b>event0</b>\n", network_event_log::GetAsString(
+  EXPECT_EQ("<b><i>event0</i></b>\n", network_event_log::GetAsString(
       OLDEST_FIRST, "html", kDefaultLevel, 1));
   EXPECT_EQ("[time] file:0 event0: description\n",
             SkipTime(network_event_log::GetAsString(
diff --git a/chromeos/network/network_state_handler.cc b/chromeos/network/network_state_handler.cc
index 053a932e..ca214e9 100644
--- a/chromeos/network/network_state_handler.cc
+++ b/chromeos/network/network_state_handler.cc
@@ -123,8 +123,8 @@ void NetworkStateHandler::SetTechnologyEnabled(
     bool enabled,
     const network_handler::ErrorCallback& error_callback) {
   std::string technology = GetTechnologyForType(type);
-  NET_LOG_EVENT("SetTechnologyEnabled",
-                base::StringPrintf("%s:%d", technology.c_str(), enabled));
+  NET_LOG_USER("SetTechnologyEnabled",
+               base::StringPrintf("%s:%d", technology.c_str(), enabled));
   shill_property_handler_->SetTechnologyEnabled(
       technology, enabled, error_callback);
   // Signal Technology state changed -> ENABLING
@@ -255,7 +255,7 @@ void NetworkStateHandler::GetNetworkList(NetworkStateList* list) const {
 }
 
 void NetworkStateHandler::RequestScan() const {
-  NET_LOG_EVENT("RequestScan", "");
+  NET_LOG_USER("RequestScan", "");
   shill_property_handler_->RequestScan();
 }
 
@@ -267,7 +267,7 @@ void NetworkStateHandler::WaitForScan(const std::string& type,
 }
 
 void NetworkStateHandler::ConnectToBestWifiNetwork() {
-  NET_LOG_EVENT("ConnectToBestWifiNetwork", "");
+  NET_LOG_USER("ConnectToBestWifiNetwork", "");
   WaitForScan(flimflam::kTypeWifi,
               base::Bind(&internal::ShillPropertyHandler::ConnectToBestServices,
                          shill_property_handler_->AsWeakPtr()));