Re-factor network_event_log

chrome/browser/ui/webui/chromeos/about_network.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/chromeos/about_network.h"
 
 #include "ash/ash_switches.h"
 #include "base/command_line.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/strings/string_tokenizer.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/ui/webui/about_ui.h"
 #include "chromeos/network/network_event_log.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "grit/generated_resources.h"
 #include "net/base/escape.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 31 matching lines @@
 }
 
 std::string GetHeaderHtmlInfo(int refresh) {
   std::string output;
   ::about_ui::AppendHeader(&output, refresh, "About Network");
   ::about_ui::AppendBody(&output);
   AppendRefresh(&output, refresh, "network");
   return output;
 }
 
-std::string GetHeaderEventLogInfo() {
+std::string GetHeaderEventLogInfo(bool debug) {

[pneubeck (no reviews), 2013/05/13 13:16:25]

This function's name is cryptic to me.

[stevenjb, 2013/05/13 19:36:39]

A suggestion would help since it's obviously less cryptic to me :) 
Changed to GetEventLogSection.

   std::string output;
   output.append(WrapWithH3(
       l10n_util::GetStringUTF8(IDS_ABOUT_NETWORK_EVENT_LOG)));
   output.append("<pre style=\""
                 "border-style:solid; border-width:1px; "
                 "overflow: auto; "
                 "height:200px;\">");
+  network_event_log::LogLevel log_level = debug
+      ? network_event_log::LOG_LEVEL_DEBUG
+      : network_event_log::LOG_LEVEL_EVENT;
+  std::string format = debug ? "file,time,desc,html" : "time,desc,html";
   output.append(
-      network_event_log::GetAsString(network_event_log::NEWEST_FIRST, 0));
+      network_event_log::GetAsString(network_event_log::NEWEST_FIRST,

[pneubeck (no reviews), 2013/05/13 13:16:25]

creating html content from insecure sources (like network name) is very
unhealthy. This has to use appropriate escaping. This is also true for <pre>'s
content.

[stevenjb, 2013/05/13 19:36:39]

Yeah, this is long overdue to be replaced with WebUI. Right after we fix
settings...
Good catch, added escaping.

+                                     format, log_level, 0));
   output.append("</pre>");
   return output;
 }
 
 // NetworkLibrary tables
 
 std::string NetworkToHtmlTableHeader(const Network* network) {
   std::string str =
       WrapWithTH("Name") +
       WrapWithTH("Active") +
@@ skipping 202 matching lines @@
   }
   output.append("</table>");
   return output;
 }
 
 }  // namespace
 
 namespace about_ui {
 
 std::string AboutNetwork(const std::string& query) {
-  int refresh;
-  base::StringToInt(query, &refresh);
+  base::StringTokenizer tok(query, "/");

[gauravsh, 2013/05/13 00:34:51]

Update the comment for AboutNetwork in about_network.h.

[pneubeck (no reviews), 2013/05/13 13:16:25]

shouldn't this be separated by '&' ?

[stevenjb, 2013/05/13 19:36:39]

We should really have a proper UI here. This is a quick and dirty hack, I wanted
to remain consistent with the /X for refresh. Comment updated.

+  int refresh = 0;
+  bool debug = false;
+  while (tok.GetNext()) {
+    std::string token = tok.token();
+    if (token == "debug")
+      debug = true;
+    else
+      base::StringToInt(token, &refresh);
+  }
   std::string output = GetHeaderHtmlInfo(refresh);
   if (network_event_log::IsInitialized())
-    output += GetHeaderEventLogInfo();
+    output += GetHeaderEventLogInfo(debug);
   if (!CommandLine::ForCurrentProcess()->HasSwitch(
           ash::switches::kAshDisableNewNetworkStatusArea)) {
     output += GetNetworkStateHtmlInfo();
   } else {
     output += GetCrosNetworkHtmlInfo();
   }
   return output;
 }
 
 }  // namespace about_ui
 
 }  // namespace chromeos