CrOS: Add Discard Tab command link to about:discards

chrome/browser/browser_about_handler.cc

 // Copyright (c) 2011 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/browser_about_handler.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 658 matching lines @@
 
   return output;
 }
 
 std::string AboutCryptohome(const std::string& query) {
   int refresh;
   base::StringToInt(query, &refresh);
   return GetCryptohomeHtmlInfo(refresh);
 }
 
-std::string AboutDiscards() {
+std::string AboutDiscards(const std::string& path) {
   std::string output;
+  const std::string kRunCommand("run");
+  if (path == kRunCommand) {
+    output.append(WrapWithTag("p", "Discarding a tab..."));
+    g_browser_process->oom_priority_manager()->DiscardTab();
+  }
   AppendHeader(&output, 0, "About discards");
   AppendBody(&output);
   output.append("<h3>About discards</h3>");
   output.append(
       "<p>Tabs sorted from most interesting to least interesting. The least "
       "interesting tab may be discarded if we run out of physical memory.</p>");
 
   std::vector<string16> titles =
       g_browser_process->oom_priority_manager()->GetTabTitles();
   if (!titles.empty()) {
     output.append("<ol>");
     std::vector<string16>::iterator it = titles.begin();
     for ( ; it != titles.end(); ++it) {
       std::string title = UTF16ToUTF8(*it);
       output.append(WrapWithTag("li", title));
     }
     output.append("</ol>");
   } else {
     output.append("<p>None found.  Wait 10 seconds, then refresh.</p>");
   }
+  output.append(
+      "<a href='chrome://discards/" + kRunCommand + "'>Discard tab now</a>");
 
   base::SystemMemoryInfoKB meminfo;
   base::GetSystemMemoryInfo(&meminfo);
   output.append("<h3>System memory information in MB</h3>");
   output.append("<table>");
   output.append(AddStringRow(
-    "Total Memory", base::IntToString(meminfo.total / 1024)));
+    "Total", base::IntToString(meminfo.total / 1024)));
   output.append(AddStringRow(
-    "Free Memory", base::IntToString(meminfo.free / 1024)));
+    "Free", base::IntToString(meminfo.free / 1024)));
   output.append(AddStringRow(
-    "Buffered Memory", base::IntToString(meminfo.buffers / 1024)));
+    "Buffered", base::IntToString(meminfo.buffers / 1024)));
   output.append(AddStringRow(
-    "Cached Memory", base::IntToString(meminfo.cached / 1024)));
+    "Cached", base::IntToString(meminfo.cached / 1024)));
   output.append(AddStringRow(
-    "Committed Memory", base::IntToString(
+    "Committed", base::IntToString(
     (meminfo.total - meminfo.free - meminfo.buffers - meminfo.cached) / 1024)));
   output.append(AddStringRow(
-    "Active Anon Memory", base::IntToString(meminfo.active_anon / 1024)));
+    "Active Anon", base::IntToString(meminfo.active_anon / 1024)));
   output.append(AddStringRow(
-    "Inactive Anon Memory", base::IntToString(meminfo.inactive_anon / 1024)));
+    "Inactive Anon", base::IntToString(meminfo.inactive_anon / 1024)));
   output.append(AddStringRow(
-    "Shared Memory", base::IntToString(meminfo.shmem / 1024)));
+    "Shared", base::IntToString(meminfo.shmem / 1024)));
   output.append("</table>");
 
   AppendFooter(&output);
   return output;
 }
 
 #endif  // OS_CHROMEOS
 
 // AboutDnsHandler bounces the request back to the IO thread to collect
 // the DNS information.
@@ skipping 666 matching lines @@
   if (host == chrome::kChromeUIChromeURLsHost) {
     response = ChromeURLs();
   } else if (host == chrome::kChromeUICreditsHost) {
     int idr = (path == kCreditsJsPath) ? IDR_CREDITS_JS : IDR_CREDITS_HTML;
     response = ResourceBundle::GetSharedInstance().GetRawDataResource(
         idr).as_string();
 #if defined(OS_CHROMEOS)
   } else if (host == chrome::kChromeUICryptohomeHost) {
     response = AboutCryptohome(path);
   } else if (host == chrome::kChromeUIDiscardsHost) {
-    response = AboutDiscards();
+    response = AboutDiscards(path);
 #endif
   } else if (host == chrome::kChromeUIDNSHost) {
     AboutDnsHandler::Start(this, request_id);
     return;
   } else if (host == chrome::kChromeUIHistogramsHost) {
     response = AboutHistograms(path);
 #if defined(OS_LINUX)
   } else if (host == chrome::kChromeUILinuxProxyConfigHost) {
     response = AboutLinuxProxyConfig();
 #endif
@@ skipping 180 matching lines @@
   return false;
 }
 
 std::vector<std::string> ChromePaths() {
   std::vector<std::string> paths;
   paths.reserve(arraysize(kChromePaths));
   for (size_t i = 0; i < arraysize(kChromePaths); i++)
     paths.push_back(kChromePaths[i]);
   return paths;
 }