summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/prerender/prerender_manager.cc60
-rw-r--r--chrome/browser/prerender/prerender_manager.h6
-rw-r--r--chrome/browser/prerender/prerender_observer.cc25
-rw-r--r--chrome/browser/prerender/prerender_observer.h2
4 files changed, 1 insertions, 92 deletions
diff --git a/chrome/browser/prerender/prerender_manager.cc b/chrome/browser/prerender/prerender_manager.cc
index a66fd8f..8ba0788 100644
--- a/chrome/browser/prerender/prerender_manager.cc
+++ b/chrome/browser/prerender/prerender_manager.cc
@@ -15,7 +15,6 @@
#include "base/utf_string_conversions.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/favicon/favicon_tab_helper.h"
-#include "chrome/browser/history/top_sites.h"
#include "chrome/browser/prerender/prerender_condition.h"
#include "chrome/browser/prerender/prerender_contents.h"
#include "chrome/browser/prerender/prerender_final_status.h"
@@ -27,19 +26,15 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
#include "chrome/browser/ui/tab_contents/tab_contents_wrapper_delegate.h"
-#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/render_messages.h"
#include "content/browser/browser_thread.h"
-#include "content/browser/cancelable_request.h"
#include "content/browser/renderer_host/render_process_host.h"
#include "content/browser/renderer_host/render_view_host.h"
#include "content/browser/renderer_host/resource_dispatcher_host.h"
#include "content/browser/tab_contents/render_view_host_manager.h"
#include "content/browser/tab_contents/tab_contents.h"
#include "content/browser/tab_contents/tab_contents_delegate.h"
-#include "content/common/notification_observer.h"
-#include "content/common/notification_registrar.h"
#include "content/common/notification_service.h"
namespace prerender {
@@ -170,58 +165,6 @@ struct PrerenderManager::PendingContentsData {
Origin origin_;
};
-class PrerenderManager::MostVisitedSites : public NotificationObserver {
- public:
- explicit MostVisitedSites(Profile* profile) :
- profile_(profile) {
- history::TopSites* ts = profile_->GetTopSites();
- if (ts) {
- registrar_.Add(this, chrome::NOTIFICATION_TOP_SITES_CHANGED,
- Source<history::TopSites>(ts));
- }
-
- UpdateMostVisited();
- }
-
- void UpdateMostVisited() {
- history::TopSites* ts = profile_->GetTopSites();
- if (ts) {
- ts->GetMostVisitedURLs(
- &topsites_consumer_,
- NewCallback(this,
- &prerender::PrerenderManager::MostVisitedSites::
- OnMostVisitedURLsAvailable));
- }
- }
-
- void OnMostVisitedURLsAvailable(const history::MostVisitedURLList& data) {
- urls_.clear();
- for (int i = 0; i < static_cast<int>(data.size()); i++)
- urls_.insert(data[i].url);
- }
-
- void Observe(int type,
- const NotificationSource& source,
- const NotificationDetails& details) {
- DCHECK_EQ(type, chrome::NOTIFICATION_TOP_SITES_CHANGED);
- UpdateMostVisited();
- }
-
- bool IsTopSite(const GURL& url) {
- return (urls_.count(url) > 0);
- }
-
- private:
- CancelableRequestConsumer topsites_consumer_;
- Profile* profile_;
- NotificationRegistrar registrar_;
- std::set<GURL> urls_;
-};
-
-bool PrerenderManager::IsTopSite(const GURL& url) {
- return most_visited_->IsTopSite(url);
-}
-
PrerenderManager::PrerenderManager(Profile* profile,
PrerenderTracker* prerender_tracker)
: enabled_(true),
@@ -232,8 +175,7 @@ PrerenderManager::PrerenderManager(Profile* profile,
base::TimeDelta::FromMilliseconds(kMinTimeBetweenPrerendersMs)),
runnable_method_factory_(this),
prerender_history_(new PrerenderHistory(kHistoryLength)),
- histograms_(new PrerenderHistograms()),
- most_visited_(new MostVisitedSites(profile)) {
+ histograms_(new PrerenderHistograms()) {
// There are some assumptions that the PrerenderManager is on the UI thread.
// Any other checks simply make sure that the PrerenderManager is accessed on
// the same thread that it was created on.
diff --git a/chrome/browser/prerender/prerender_manager.h b/chrome/browser/prerender/prerender_manager.h
index 8566b85..77481db 100644
--- a/chrome/browser/prerender/prerender_manager.h
+++ b/chrome/browser/prerender/prerender_manager.h
@@ -204,8 +204,6 @@ class PrerenderManager : public base::SupportsWeakPtr<PrerenderManager>,
// Adds a condition. This is owned by the PrerenderManager.
void AddCondition(const PrerenderCondition* condition);
- bool IsTopSite(const GURL& url);
-
protected:
// Test that needs needs access to internal functions.
FRIEND_TEST_ALL_PREFIXES(PrerenderManagerTest, ExpireTest);
@@ -229,8 +227,6 @@ class PrerenderManager : public base::SupportsWeakPtr<PrerenderManager>,
class OnCloseTabContentsDeleter;
- class MostVisitedSites;
-
// Adds a prerender for |url| from referrer |referrer| initiated from the
// RenderViewHost specified by |child_route_id_pair|. The |origin| specifies
// how the prerender was added.
@@ -394,8 +390,6 @@ class PrerenderManager : public base::SupportsWeakPtr<PrerenderManager>,
scoped_ptr<PrerenderHistograms> histograms_;
- scoped_ptr<MostVisitedSites> most_visited_;
-
DISALLOW_COPY_AND_ASSIGN(PrerenderManager);
};
diff --git a/chrome/browser/prerender/prerender_observer.cc b/chrome/browser/prerender/prerender_observer.cc
index d47a723..246e9a1 100644
--- a/chrome/browser/prerender/prerender_observer.cc
+++ b/chrome/browser/prerender/prerender_observer.cc
@@ -80,19 +80,6 @@ class PerHoverThresholdHistograms {
base::Histogram* time_hover_until_click_;
};
-enum PAGEVIEW_EVENTS {
- PAGEVIEW_EVENT_NEW_URL = 0,
- PAGEVIEW_EVENT_TOP_SITE_NEW_URL = 1,
- PAGEVIEW_EVENT_LOAD_START = 2,
- PAGEVIEW_EVENT_TOP_SITE_LOAD_START = 3,
- PAGEVIEW_EVENT_MAX = 4
-};
-
-void RecordPageviewEvent(PAGEVIEW_EVENTS event) {
- UMA_HISTOGRAM_ENUMERATION("Prerender.PageviewEvents",
- event, PAGEVIEW_EVENT_MAX);
-}
-
} // namespace
class PrerenderObserver::HoverData {
@@ -193,9 +180,6 @@ PrerenderObserver::~PrerenderObserver() {
void PrerenderObserver::ProvisionalChangeToMainFrameUrl(const GURL& url,
bool has_opener_set) {
- RecordPageviewEvent(PAGEVIEW_EVENT_NEW_URL);
- if (IsTopSite(url))
- RecordPageviewEvent(PAGEVIEW_EVENT_TOP_SITE_NEW_URL);
if (!tab_->delegate())
return; // PrerenderManager needs a delegate to handle the swap.
PrerenderManager* prerender_manager = MaybeGetPrerenderManager();
@@ -221,10 +205,6 @@ void PrerenderObserver::OnDidStartProvisionalLoadForFrame(int64 frame_id,
bool has_opener_set,
const GURL& url) {
if (is_main_frame) {
- RecordPageviewEvent(PAGEVIEW_EVENT_LOAD_START);
- if (IsTopSite(url))
- RecordPageviewEvent(PAGEVIEW_EVENT_TOP_SITE_LOAD_START);
-
// Record the beginning of a new PPLT navigation.
pplt_load_start_ = base::TimeTicks::Now();
@@ -323,9 +303,4 @@ void PrerenderObserver::MaybeLogCurrentHover(bool was_used) {
current_hover_url_ = GURL();
}
-bool PrerenderObserver::IsTopSite(const GURL& url) {
- PrerenderManager* pm = MaybeGetPrerenderManager();
- return (pm && pm->IsTopSite(url));
-}
-
} // namespace prerender
diff --git a/chrome/browser/prerender/prerender_observer.h b/chrome/browser/prerender/prerender_observer.h
index fa3aa94..d4174cb 100644
--- a/chrome/browser/prerender/prerender_observer.h
+++ b/chrome/browser/prerender/prerender_observer.h
@@ -61,8 +61,6 @@ class PrerenderObserver : public TabContentsObserver {
// Also resets the hover to no hover.
void MaybeLogCurrentHover(bool was_used);
- bool IsTopSite(const GURL& url);
-
// TabContentsWrapper we're created for.
TabContentsWrapper* tab_;
generated by cgit v1.1 at 2025-02-12 13:55:30 +0000