Port browser_about_handler. Some parts are still NOTIMPLEMENTED.

Review URL: http://codereview.chromium.org/20300
Patch from Craig Schlenter <craig.schlenter@gmail.com>.


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

4 files changed, 16 insertions, 5 deletions

diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons
index 94eed65..f32213f 100644
--- a/chrome/browser/browser.scons
+++ b/chrome/browser/browser.scons
@@ -673,7 +673,6 @@ if not env.Bit('windows'):
       'bookmarks/bookmark_drag_data.cc',
       'bookmarks/bookmark_drop_info.cc',
       'bookmarks/bookmark_utils.cc',
-      'browser_about_handler.cc',
       'browser_accessibility.cc',
       'browser_accessibility_manager.cc',
       'browser_shutdown.cc',
diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc
index bf89af0..d92c15f 100644
--- a/chrome/browser/browser_about_handler.cc
+++ b/chrome/browser/browser_about_handler.cc
@@ -23,7 +23,6 @@
 #include "chrome/browser/profile.h"
 #include "chrome/browser/profile_manager.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
-#include "chrome/browser/views/about_ipc_dialog.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/pref_names.h"
@@ -37,6 +36,7 @@
 #endif
 
 #if defined(OS_WIN)
+#include "chrome/browser/views/about_ipc_dialog.h"
 #include "chrome/browser/views/about_network_dialog.h"
 #endif
 
@@ -111,7 +111,7 @@ void AboutSource::StartDataRequest(const std::string& path_raw,
                                    int request_id) {
   std::string path = path_raw;
   std::string info;
-  if (path.find("/") != -1) {
+  if (path.find("/") != std::string::npos) {
     size_t pos = path.find("/");
     info = path.substr(pos + 1, path.length() - (pos + 1));
     path = path.substr(0, pos);
@@ -172,8 +172,13 @@ bool BrowserAboutHandler::MaybeHandle(GURL* url,
   }
 
   if (LowerCaseEqualsASCII(url->path(), "network")) {
+#if defined(OS_WIN)
     // Run the dialog. This will re-use the existing one if it's already up.
     AboutNetworkDialog::RunDialog();
+#else
+    NOTIMPLEMENTED();
+    // TODO(port) Implement this.
+#endif
 
     // Navigate the renderer to about:blank. This is kind of stupid but is the
     // easiest thing to do in this situation without adding a lot of complexity
@@ -184,8 +189,13 @@ bool BrowserAboutHandler::MaybeHandle(GURL* url,
 
 #ifdef IPC_MESSAGE_LOG_ENABLED
   if (LowerCaseEqualsASCII(url->path(), "ipc")) {
+#if defined(OS_WIN)
     // Run the dialog. This will re-use the existing one if it's already up.
     AboutIPCDialog::RunDialog();
+#else
+    NOTIMPLEMENTED();
+    // TODO(port) Implement this.
+#endif
     *url = GURL("about:blank");
     return false;
   }
@@ -390,7 +400,7 @@ std::string BrowserAboutHandler::AboutStats() {
 
     // JSON doesn't allow '.' in names.
     size_t pos;
-    while ((pos = name.find(".")) != -1)
+    while ((pos = name.find(".")) != std::string::npos)
       name.replace(pos, 1, ":");
 
     // Try to see if this name already exists.
diff --git a/chrome/browser/browser_about_handler.h b/chrome/browser/browser_about_handler.h
index afd6d13..c90d42d 100644
--- a/chrome/browser/browser_about_handler.h
+++ b/chrome/browser/browser_about_handler.h
@@ -33,7 +33,7 @@ class BrowserAboutHandler : public WebContents {
   // We don't want a favicon on the about pages.
   virtual bool ShouldDisplayFavIcon() { return false; }
   // Enable javascript urls for the about pages.
-  virtual bool BrowserAboutHandler::SupportsURL(GURL* url);
+  virtual bool SupportsURL(GURL* url);
 
   // If |url| is a known "about:" URL, this method handles it
   // and sets |url| to an alternate URL indicating the real content to load.
diff --git a/chrome/chrome.xcodeproj/project.pbxproj b/chrome/chrome.xcodeproj/project.pbxproj
index ed3223e..52bc7bc 100644
--- a/chrome/chrome.xcodeproj/project.pbxproj
+++ b/chrome/chrome.xcodeproj/project.pbxproj
@@ -241,6 +241,7 @@
 		534E66C40F311BEC0006B2B2 /* temp_scaffolding_stubs.cc in Sources */ = {isa = PBXBuildFile; fileRef = 534E66C30F311BEC0006B2B2 /* temp_scaffolding_stubs.cc */; };
 		544FBC49CB83E458B6B7069D /* test_web_contents.cc in Sources */ = {isa = PBXBuildFile; fileRef = 56E1D7DF17D327BFCB0B895D /* test_web_contents.cc */; };
 		65930533A98EF22451EEA01D /* history_publisher_none.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7849CCC221723C1BC14D6384 /* history_publisher_none.cc */; };
+		6685F5375CC4ECE98C4C2213 /* browser_about_handler.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BF8320E9D4839009A6919 /* browser_about_handler.cc */; };
 		671555F7DF06E224B646E5D2 /* backing_store_posix.cc in Sources */ = {isa = PBXBuildFile; fileRef = B94B5B0CBF4D7FAC48BB1AE2 /* backing_store_posix.cc */; };
 		6A3646C882BD4CC722624544 /* character_encoding.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BF8590E9D4839009A6919 /* character_encoding.cc */; };
 		6D62D71064BA3204EF0A964A /* autofill_manager.cc in Sources */ = {isa = PBXBuildFile; fileRef = 629BF493DEA096E2DD844F2B /* autofill_manager.cc */; };
@@ -5285,6 +5286,7 @@
 				A0BC9272AD709E86D492DAEC /* bookmark_storage.cc in Sources */,
 				E40CC5F70F2E351A00708647 /* bookmark_table_model.cc in Sources */,
 				E46C4C2E0F212CAF00B393B8 /* browser.cc in Sources */,
+				6685F5375CC4ECE98C4C2213 /* browser_about_handler.cc in Sources */,
 				B61C4C1F0F3284A700489E0F /* browser_init.cc in Sources */,
 				E46C4D0F0F2138D400B393B8 /* browser_list.cc in Sources */,
 				E45063530EE9BF31003BE099 /* browser_main.cc in Sources */,