Retry r88137:

chrome/browser/ui/webui/ntp/most_visited_handler.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/ntp/most_visited_handler.h"
 
 #include <set>
 
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 66 matching lines @@
                    Source<history::TopSites>(ts));
   }
 
   // We pre-emptively make a fetch for the most visited pages so we have the
   // results sooner.
   StartQueryForMostVisited();
   return result;
 }
 
 void MostVisitedHandler::RegisterMessages() {
-  // Register ourselves as the handler for the "getMostSisited" message from
-  // Javascript.
   web_ui_->RegisterMessageCallback("getMostVisited",
       NewCallback(this, &MostVisitedHandler::HandleGetMostVisited));
 
   // Register ourselves for any most-visited item blacklisting.
   web_ui_->RegisterMessageCallback("blacklistURLFromMostVisited",
       NewCallback(this, &MostVisitedHandler::HandleBlacklistURL));
   web_ui_->RegisterMessageCallback("removeURLsFromMostVisitedBlacklist",
       NewCallback(this, &MostVisitedHandler::HandleRemoveURLsFromBlacklist));
   web_ui_->RegisterMessageCallback("clearMostVisitedURLsBlacklist",
       NewCallback(this, &MostVisitedHandler::HandleClearBlacklist));
@@ skipping 185 matching lines @@
     NewTabUI::SetURLTitleAndDirection(page_value,
                                       url.title,
                                       url.url);
     if (!url.favicon_url.is_empty())
       page_value->SetString("faviconUrl", url.favicon_url.spec());
 
     // Special case for prepopulated pages: thumbnailUrl is different from url.
     if (url.url.spec() == l10n_util::GetStringUTF8(IDS_CHROME_WELCOME_URL)) {
       page_value->SetString("thumbnailUrl",
           "chrome://theme/IDR_NEWTAB_CHROME_WELCOME_PAGE_THUMBNAIL");
+      page_value->SetString("faviconDominantColor", "rgb(0, 147, 60)");

[tony, 2011/06/09 20:37:23]

Nit: Might be worth commenting what these colors are.  Or you could do something
like const char* kGreen = "rgb(...)";

[Evan Stade, 2011/06/09 20:51:07]

I did once ask someone in a code review to do this, but have since decided it's
not worth it. The problem is I wouldn't know what to call it (this color is
different from what you get if you were to type just "green" in css). Seems the
best way to get an accurate idea of the color is to use some graphic tool. And
FWIW, we don't usually do this when colors are defined in css files, which is
pretty much the same situation. 

     } else if (url.url.spec() ==
                l10n_util::GetStringUTF8(IDS_THEMES_GALLERY_URL)) {
       page_value->SetString("thumbnailUrl",
           "chrome://theme/IDR_NEWTAB_THEMES_GALLERY_THUMBNAIL");
+      page_value->SetString("faviconDominantColor", "rgb(63, 132, 197)");
     }
 
     history::TopSites* ts = web_ui_->GetProfile()->GetTopSites();
     if (ts && ts->IsURLPinned(url.url))
       page_value->SetBoolean("pinned", true);
     pages_value_->Append(page_value);
   }
 }
 
 void MostVisitedHandler::OnMostVisitedURLsAvailable(
@@ skipping 68 matching lines @@
 
 // static
 std::vector<GURL> MostVisitedHandler::GetPrePopulatedUrls() {
   const std::vector<MostVisitedPage> pages =
       MostVisitedHandler::GetPrePopulatedPages();
   std::vector<GURL> page_urls;
   for (size_t i = 0; i < pages.size(); ++i)
     page_urls.push_back(pages[i].url);
   return page_urls;
 }