do not mention other browsers in about:memory for chromeos

BUG=34839
TEST=verify per bug report

Review URL: http://codereview.chromium.org/650161

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

4 files changed, 10 insertions, 1 deletions

diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc
index 039d6d4..88ee96f 100644
--- a/chrome/browser/browser_about_handler.cc
+++ b/chrome/browser/browser_about_handler.cc
@@ -23,6 +23,7 @@
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_thread.h"
+#include "chrome/browser/defaults.h"
 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/google_service_auth_error.h"
 #include "chrome/browser/memory_details.h"
@@ -843,6 +844,9 @@ void AboutMemoryHandler::OnDetailsAvailable() {
       AppendProcess(child_data, &process.processes[index]);
   }
 
+  root.SetBoolean(L"show_other_browsers",
+      browser_defaults::kShowOtherBrowsersInAboutMemory);
+
   // Get about_memory.html
   static const base::StringPiece memory_html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
diff --git a/chrome/browser/defaults.cc b/chrome/browser/defaults.cc
index 16017ab..89bd8a2 100644
--- a/chrome/browser/defaults.cc
+++ b/chrome/browser/defaults.cc
@@ -24,6 +24,7 @@ const bool kOSSupportsOtherBrowsers = false;
 const bool kDownloadPageHasShowInFolder = false;
 const bool kSizeTabButtonToTopOfTabStrip = true;
 const bool kBootstrapSyncAuthentication = true;
+const bool kShowOtherBrowsersInAboutMemory = false;
 
 #elif defined(OS_LINUX)
 
@@ -69,6 +70,7 @@ const bool kShowAboutMenuItem = true;
 const bool kOSSupportsOtherBrowsers = true;
 const bool kSizeTabButtonToTopOfTabStrip = false;
 const bool kBootstrapSyncAuthentication = false;
+const bool kShowOtherBrowsersInAboutMemory = true;
 
 #endif
 
diff --git a/chrome/browser/defaults.h b/chrome/browser/defaults.h
index c2e2c1d..3feb44c 100644
--- a/chrome/browser/defaults.h
+++ b/chrome/browser/defaults.h
@@ -69,6 +69,9 @@ extern const bool kBootstrapSyncAuthentication;
 // field.
 extern const bool kEnablePinnedTabs;
 
+// Should other browsers be shown in about:memory page?
+extern const bool kShowOtherBrowsersInAboutMemory;
+
 }  // namespace browser_defaults
 
 #endif  // CHROME_BROWSER_DEFAULTS_H_
diff --git a/chrome/browser/resources/about_memory_linux.html b/chrome/browser/resources/about_memory_linux.html
index 70c92de..7731097 100644
--- a/chrome/browser/resources/about_memory_linux.html
+++ b/chrome/browser/resources/about_memory_linux.html
@@ -478,7 +478,7 @@ function enableHelpTooltips() {
           </td>
         </tr>
       </table>
-      <div class=otherbrowsers jsdisplay="browsers.length == 1">
+      <div class=otherbrowsers jsdisplay="show_other_browsers && browsers.length == 1">
         Note: If other browsers (e.g. IE, Firefox, Safari) are running,
         I'll show their memory details here.
       </div>