Partial porting of the about handler.

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

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

2 files changed, 18 insertions, 24 deletions

diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc
index 91df8c4..075a8b0 100644
--- a/chrome/browser/browser_about_handler.cc
+++ b/chrome/browser/browser_about_handler.cc
@@ -9,28 +9,22 @@
 
 #include "base/file_version_info.h"
 #include "base/histogram.h"
-#include "base/image_util.h"
-#include "base/process_util.h"
 #include "base/stats_table.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "base/tracked_objects.h"
 #include "chrome/app/locales/locale_settings.h"
 #include "chrome/browser/browser.h"
-#include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_resources.h"
 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/memory_details.h"
 #include "chrome/browser/net/dns_global.h"
-#include "chrome/browser/plugin_process_host.h"
-#include "chrome/browser/plugin_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/profile_manager.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/ipc_status_view.h"
-#include "chrome/browser/views/about_network_dialog.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/pref_names.h"
@@ -43,6 +37,10 @@
 #include "v8/include/v8.h"
 #endif
 
+#if defined(OS_WIN)
+#include "chrome/browser/views/about_network_dialog.h"
+#endif
+
 #include "chromium_strings.h"
 #include "generated_resources.h"
 
@@ -79,7 +77,7 @@ class AboutSource : public ChromeURLDataManager::DataSource {
   void FinishDataRequest(const std::string& html, int request_id);
 
  private:
-  DISALLOW_EVIL_CONSTRUCTORS(AboutSource);
+  DISALLOW_COPY_AND_ASSIGN(AboutSource);
 };
 
 // Handling about:memory is complicated enough to encapsulate it's
@@ -99,7 +97,7 @@ class AboutMemoryHandler : public MemoryDetails {
 
   AboutSource* source_;
   int request_id_;
-  DISALLOW_EVIL_CONSTRUCTORS(AboutMemoryHandler);
+  DISALLOW_COPY_AND_ASSIGN(AboutMemoryHandler);
 };
 
 AboutSource::AboutSource()
@@ -336,7 +334,7 @@ std::string BrowserAboutHandler::AboutPlugins() {
 }
 
 // static
-std::string BrowserAboutHandler::AboutHistograms(const std::string query) {
+std::string BrowserAboutHandler::AboutHistograms(const std::string& query) {
   std::string data;
   StatisticsRecorder::WriteHTMLGraph(query, &data);
   return data;
diff --git a/chrome/browser/browser_about_handler.h b/chrome/browser/browser_about_handler.h
index 1d41547..afd6d13 100644
--- a/chrome/browser/browser_about_handler.h
+++ b/chrome/browser/browser_about_handler.h
@@ -4,27 +4,24 @@
 
 // Contains code for handling "about:" URLs in the browser process.
 
-#ifndef CHROME_BROWSER_BROWSER_ABOUT_HANDLER_H__
-#define CHROME_BROWSER_BROWSER_ABOUT_HANDLER_H__
+#ifndef CHROME_BROWSER_BROWSER_ABOUT_HANDLER_H_
+#define CHROME_BROWSER_BROWSER_ABOUT_HANDLER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
-#include "base/image_util.h"
+#include "chrome/browser/tab_contents/tab_contents_type.h"
 #include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 
+class AboutSource;
+class DictionaryValue;
 class GURL;
-class Profile;
 class ListValue;
-class DictionaryValue;
+class Profile;
 class RenderProcessHost;
-class AboutSource;
-enum TabContentsType;
-namespace process_util {
-  struct CommittedKBytes;
-  struct WorkingSetKBytes;
-}
+class RenderViewHostFactory;
+class SiteInstance;
 
 class BrowserAboutHandler : public WebContents {
  public:
@@ -51,7 +48,7 @@ class BrowserAboutHandler : public WebContents {
   static std::string AboutPlugins();
 
   // Renders a special page for about:histograms.
-  static std::string AboutHistograms(const std::string query);
+  static std::string AboutHistograms(const std::string& query);
 
   // Renders a special page about:objects (about tracked objects such as Tasks).
   static std::string AboutObjects(const std::string& query);
@@ -76,8 +73,7 @@ class BrowserAboutHandler : public WebContents {
 
  private:
   ChromeURLDataManager::DataSource* about_source_;
-  DISALLOW_EVIL_CONSTRUCTORS(BrowserAboutHandler);
+  DISALLOW_COPY_AND_ASSIGN(BrowserAboutHandler);
 };
 
-#endif  // CHROME_BROWSER_BROWSER_ABOUT_HANDLER_H__
-
+#endif  // CHROME_BROWSER_BROWSER_ABOUT_HANDLER_H_