Reupload of 12418

chrome/browser/dom_ui/new_tab_ui.cc

 // Copyright (c) 2006-2008 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/dom_ui/new_tab_ui.h"
 
 #include "base/histogram.h"
 #include "base/string_piece.h"
 #include "chrome/app/locales/locale_settings.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_resources.h"
+#include "chrome/browser/dom_ui/dom_ui_contents.h"
 #include "chrome/browser/history_tab_ui.h"
 #include "chrome/browser/history/page_usage_data.h"
 #include "chrome/browser/navigation_entry.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/render_view_host.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/template_url.h"
 #include "chrome/browser/user_data_manager.h"
 #include "chrome/browser/user_metrics.h"
 #include "chrome/browser/views/keyword_editor_view.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/resource_bundle.h"
 
 #include "chromium_strings.h"
 #include "generated_resources.h"
 
 using base::Time;
 using base::TimeDelta;
 using base::TimeTicks;
 
 // The URL scheme used for the new tab.
 static const char kNewTabUIScheme[] = "chrome-internal";
 
-// The path used in internal URLs to thumbnail data.
-static const char kThumbnailPath[] = "thumb";
-
-// The path used in internal URLs to favicon data.
-static const char kFavIconPath[] = "favicon";
-
 // The number of most visited pages we show.
 const int kMostVisitedPages = 9;
 
 // The number of days of history we consider for most visited entries.
 const int kMostVisitedScope = 90;
 
 // The number of recent bookmarks we show.
 static const int kRecentBookmarks = 9;
 
 // The number of search URLs to show.
@@ skipping 201 matching lines @@
       incognito_tab_html, &localized_strings, "t" /* template root node id */);
 
   scoped_refptr<RefCountedBytes> html_bytes(new RefCountedBytes);
   html_bytes->data.resize(full_html.size());
   std::copy(full_html.begin(), full_html.end(), html_bytes->data.begin());
 
   SendResponse(request_id, html_bytes);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-// ThumbnailSource
-
-ThumbnailSource::ThumbnailSource(Profile* profile)
-    : DataSource(kThumbnailPath, MessageLoop::current()), profile_(profile) {}
-
-void ThumbnailSource::StartDataRequest(const std::string& path,
-                                       int request_id) {
-  HistoryService* hs = profile_->GetHistoryService(Profile::EXPLICIT_ACCESS);
-  if (hs) {
-    HistoryService::Handle handle = hs->GetPageThumbnail(
-        GURL(path),
-        &cancelable_consumer_,
-        NewCallback(this, &ThumbnailSource::OnThumbnailDataAvailable));
-    // Attach the ChromeURLDataManager request ID to the history request.
-    cancelable_consumer_.SetClientData(hs, handle, request_id);
-  } else {
-    // Tell the caller that no thumbnail is available.
-    SendResponse(request_id, NULL);
-  }
-}
-
-void ThumbnailSource::OnThumbnailDataAvailable(
-    HistoryService::Handle request_handle,
-    scoped_refptr<RefCountedBytes> data) {
-  HistoryService* hs =
-    profile_->GetHistoryService(Profile::EXPLICIT_ACCESS);
-  int request_id = cancelable_consumer_.GetClientData(hs, request_handle);
-  // Forward the data along to the networking system.
-  if (data.get() && !data->data.empty()) {
-    SendResponse(request_id, data);
-  } else {
-    if (!default_thumbnail_.get()) {
-      default_thumbnail_ = new RefCountedBytes;
-      ResourceBundle::GetSharedInstance().LoadImageResourceBytes(
-          IDR_DEFAULT_THUMBNAIL, &default_thumbnail_->data);
-    }
-
-    SendResponse(request_id, default_thumbnail_);
-  }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// FavIconSource
-
-FavIconSource::FavIconSource(Profile* profile)
-    : DataSource(kFavIconPath, MessageLoop::current()), profile_(profile) {}
-
-void FavIconSource::StartDataRequest(const std::string& path, int request_id) {
-  HistoryService* hs = profile_->GetHistoryService(Profile::EXPLICIT_ACCESS);
-  if (hs) {
-    HistoryService::Handle handle;
-    if (path.size() > 8 && path.substr(0, 8) == "iconurl/") {
-      handle = hs->GetFavIcon(
-          GURL(path.substr(8)),
-          &cancelable_consumer_,
-          NewCallback(this, &FavIconSource::OnFavIconDataAvailable));
-    } else {
-      handle = hs->GetFavIconForURL(
-          GURL(path),
-          &cancelable_consumer_,
-          NewCallback(this, &FavIconSource::OnFavIconDataAvailable));
-    }
-    // Attach the ChromeURLDataManager request ID to the history request.
-    cancelable_consumer_.SetClientData(hs, handle, request_id);
-  } else {
-    SendResponse(request_id, NULL);
-  }
-}
-
-void FavIconSource::OnFavIconDataAvailable(
-    HistoryService::Handle request_handle,
-    bool know_favicon,
-    scoped_refptr<RefCountedBytes> data,
-    bool expired,
-    GURL icon_url) {
-  HistoryService* hs =
-      profile_->GetHistoryService(Profile::EXPLICIT_ACCESS);
-  int request_id = cancelable_consumer_.GetClientData(hs, request_handle);
-
-  if (know_favicon && data.get() && !data->data.empty()) {
-    // Forward the data along to the networking system.
-    SendResponse(request_id, data);
-  } else {
-    if (!default_favicon_.get()) {
-      default_favicon_ = new RefCountedBytes;
-      ResourceBundle::GetSharedInstance().LoadImageResourceBytes(
-          IDR_DEFAULT_FAVICON, &default_favicon_->data);
-    }
-
-    SendResponse(request_id, default_favicon_);
-  }
-}
-
-
-///////////////////////////////////////////////////////////////////////////////
 // MostVisitedHandler
 
 MostVisitedHandler::MostVisitedHandler(DOMUIHost* dom_ui_host)
     : dom_ui_host_(dom_ui_host) {
   // Register ourselves as the handler for the "mostvisited" message from
   // Javascript.
   dom_ui_host_->RegisterMessageCallback("getMostVisited",
       NewCallback(this, &MostVisitedHandler::HandleGetMostVisited));
 
   // Set up our sources for thumbnail and favicon data.
@@ skipping 469 matching lines @@
 // NewTabUIContents
 
 // This is the top-level URL handler for chrome-internal: URLs, and exposed in
 // our header file.
 bool NewTabUIHandleURL(GURL* url,
                        TabContentsType* result_type) {
   if (!url->SchemeIs(kNewTabUIScheme))
     return false;
 
   *result_type = TAB_CONTENTS_NEW_TAB_UI;
-  *url = GURL("chrome-resource://new-tab/");
+  *url = GURL(DOMUIContents::GetScheme() + "://new-tab/");
 
   return true;
 }
 
 GURL NewTabUIURL() {
   std::string url(kNewTabUIScheme);
   url += ":";
   return GURL(url);
 }
 
@@ skipping 102 matching lines @@
 void NewTabUIContents::RequestOpenURL(const GURL& url,
                                       const GURL& /*referrer*/,
                                       WindowOpenDisposition disposition) {
   // The user opened a URL on the page (including "open in new window").
   // We count all such clicks as AUTO_BOOKMARK, which increments the site's
   // visit count (which is used for ranking the most visited entries).
   // Note this means we're including clicks on not only most visited thumbnails,
   // but also clicks on recently bookmarked.
   OpenURL(url, GURL(), disposition, PageTransition::AUTO_BOOKMARK);
 }