Normalizes URLs requested for favicons in the password manager dialog.

chrome/browser/ui/webui/favicon_source.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/ui/webui/favicon_source.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 40 matching lines @@
 
     if (path.size() > 5 && path.substr(0, 5) == "size/") {
       size_t slash = path.find("/", 5);
       std::string size = path.substr(5, slash - 5);
       int pixel_size = atoi(size.c_str());
       CHECK(pixel_size == 32 || pixel_size == 16) <<
           "only 32x32 and 16x16 icons are supported";
       request_size_map_[request_id] = pixel_size;
       url = GURL(path.substr(slash + 1));
     } else {
+      // Normally, favicons are fetched for the page currently being viewed.
+      // The password manager, however, manages passwords for entire domains.

[Evan Stade, 2012/04/17 21:44:44]

this comment should describe the behavior, and a comment in
password_manager_list.js should describe why it's using it.

[Kyle Horimoto, 2012/04/17 22:13:38]

Done.

+      // Each of its URL requests are prefixed with "origin/" to represent that
+      // the favicon fetched should belong to the domain with an empty path.
+      if (path.size() > 7 && path.substr(0, 7) == "origin/") {
+        std::string originalUrl = path.substr(7);
+
+        // If the original URL does not specify a scheme (e.g., example.com
+        // instead of http://example.com), add "http://" as a default.
+        if (!GURL(originalUrl).has_scheme())
+          originalUrl = "http://" + originalUrl;
+
+        // Strip the path beyond the top-level domain.
+        url = GURL(originalUrl).GetOrigin();
+      } else {
+        url = GURL(path);
+      }
+
       request_size_map_[request_id] = 16;
-      url = GURL(path);
     }
 
     // Intercept requests for prepopulated pages.
     for (size_t i = 0; i < arraysize(history::kPrepopulatedPages); i++) {
       if (url.spec() ==
           l10n_util::GetStringUTF8(history::kPrepopulatedPages[i].url_id)) {
         request_size_map_.erase(request_id);
         SendResponse(request_id,
             ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
                 history::kPrepopulatedPages[i].favicon_id));
@@ skipping 56 matching lines @@
       default_favicon_ =
           ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
               IDR_DEFAULT_FAVICON);
     }
     bytes = default_favicon_;
   }
   request_size_map_.erase(request_id);
 
   SendResponse(request_id, bytes);
 }