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

Unified Diff: chrome/browser/ui/webui/about_ui.cc

Issue 1257543004: Add oom tab killing and the about:discards page on linux (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@memoryPressureOnLinux
Patch Set: Created 5 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/about_ui.cc
diff --git a/chrome/browser/ui/webui/about_ui.cc b/chrome/browser/ui/webui/about_ui.cc
index 027acf32b622d78fb0802ba22e26bb26433852d7..20da3e64f816a1e6ad24455859bed70410bdba32 100644
--- a/chrome/browser/ui/webui/about_ui.cc
+++ b/chrome/browser/ui/webui/about_ui.cc
@@ -457,7 +457,7 @@ std::string ChromeURLs() {
return html;
}
-#if defined(OS_WIN) || defined(OS_CHROMEOS)
+#if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_LINUX)
const char kAboutDiscardsRunCommand[] = "run";
@@ -468,6 +468,7 @@ std::string WrapWithTag(const std::string& tag, const std::string& text) {
return "<" + tag + ">" + text + "</" + tag + ">";
}
+#if defined(OS_CHROMEOS)
// Helper function to wrap Html with <td> tag.
std::string WrapWithTD(const std::string& text) {
return "<td>" + text + "</td>";
@@ -484,6 +485,7 @@ std::string AddStringRow(const std::string& name, const std::string& value) {
row.append(WrapWithTD(value));
return WrapWithTR(row);
}
+#endif
void AddContentSecurityPolicy(std::string* output) {
output->append("<meta http-equiv='Content-Security-Policy' "
@@ -945,7 +947,7 @@ void AboutUIHTMLSource::StartDataRequest(
response = ResourceBundle::GetSharedInstance().GetRawDataResource(
idr).as_string();
-#if defined(OS_WIN) || defined(OS_CHROMEOS)
+#if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_LINUX)
} else if (source_name_ == chrome::kChromeUIDiscardsHost) {
response = AboutDiscards(path);
#endif
« no previous file with comments | « chrome/browser/memory/oom_priority_manager_browsertest.cc ('k') | chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698