Chromium Code Reviews| Index: chrome/browser/prerender/prerender_tab_helper.cc |
| diff --git a/chrome/browser/prerender/prerender_tab_helper.cc b/chrome/browser/prerender/prerender_tab_helper.cc |
| index 1d51f925fcf89e872a040724cfd692d764406884..d5c0ddb1fa2f32e212ca4845d7b8e8d671990ea8 100644 |
| --- a/chrome/browser/prerender/prerender_tab_helper.cc |
| +++ b/chrome/browser/prerender/prerender_tab_helper.cc |
| @@ -9,7 +9,6 @@ |
| #include "base/time/time.h" |
| #include "chrome/browser/password_manager/chrome_password_manager_client.h" |
|
mmenke
2015/04/09 16:29:05
No longer needed.
davidben
2015/04/09 20:43:00
Done.
|
| #include "chrome/browser/prerender/prerender_histograms.h" |
| -#include "chrome/browser/prerender/prerender_local_predictor.h" |
| #include "chrome/browser/prerender/prerender_manager.h" |
| #include "chrome/browser/prerender/prerender_manager_factory.h" |
| #include "chrome/browser/profiles/profile.h" |
| @@ -27,37 +26,12 @@ DEFINE_WEB_CONTENTS_USER_DATA_KEY(prerender::PrerenderTabHelper); |
| namespace prerender { |
| -namespace { |
| - |
| -void ReportTabHelperURLSeenToLocalPredictor( |
| - PrerenderManager* prerender_manager, |
| - const GURL& url, |
| - WebContents* web_contents) { |
| - if (!prerender_manager) |
| - return; |
| - PrerenderLocalPredictor* local_predictor = |
| - prerender_manager->local_predictor(); |
| - if (!local_predictor) |
| - return; |
| - local_predictor->OnTabHelperURLSeen(url, web_contents); |
| -} |
| - |
| -} // namespace |
| - |
| PrerenderTabHelper::PrerenderTabHelper(content::WebContents* web_contents) |
| : content::WebContentsObserver(web_contents), |
| origin_(ORIGIN_NONE), |
| next_load_is_control_prerender_(false), |
| next_load_origin_(ORIGIN_NONE), |
| weak_factory_(this) { |
| - ChromePasswordManagerClient* client = |
| - ChromePasswordManagerClient::FromWebContents(web_contents); |
| - // May be NULL during testing. |
| - if (client) { |
| - client->GetPasswordManager()->AddSubmissionCallback(base::Bind( |
| - &PrerenderTabHelper::PasswordSubmitted, weak_factory_.GetWeakPtr())); |
| - } |
| - |
| // Determine if this is a prerender. |
| PrerenderManager* prerender_manager = MaybeGetPrerenderManager(); |
| if (prerender_manager && |
| @@ -86,9 +60,6 @@ void PrerenderTabHelper::DidCommitProvisionalLoadForFrame( |
| ui::PageTransition transition_type) { |
| if (render_frame_host->GetParent()) |
| return; |
| - RecordEvent(EVENT_MAINFRAME_COMMIT); |
| - RecordEventIfLoggedInURL(EVENT_MAINFRAME_COMMIT_DOMAIN_LOGGED_IN, |
| - validated_url); |
| url_ = validated_url; |
| PrerenderManager* prerender_manager = MaybeGetPrerenderManager(); |
| if (!prerender_manager) |
| @@ -96,8 +67,6 @@ void PrerenderTabHelper::DidCommitProvisionalLoadForFrame( |
| if (prerender_manager->IsWebContentsPrerendering(web_contents(), NULL)) |
| return; |
| prerender_manager->RecordNavigation(validated_url); |
| - ReportTabHelperURLSeenToLocalPredictor(prerender_manager, validated_url, |
| - web_contents()); |
| } |
| void PrerenderTabHelper::DidStopLoading() { |
| @@ -163,25 +132,6 @@ void PrerenderTabHelper::DidStartProvisionalLoadForFrame( |
| void PrerenderTabHelper::MainFrameUrlDidChange(const GURL& url) { |
| url_ = url; |
| - RecordEvent(EVENT_MAINFRAME_CHANGE); |
| - RecordEventIfLoggedInURL(EVENT_MAINFRAME_CHANGE_DOMAIN_LOGGED_IN, url); |
| - PrerenderManager* prerender_manager = MaybeGetPrerenderManager(); |
| - if (!prerender_manager) |
| - return; |
| - if (prerender_manager->IsWebContentsPrerendering(web_contents(), NULL)) |
| - return; |
| - ReportTabHelperURLSeenToLocalPredictor(prerender_manager, url, |
| - web_contents()); |
| -} |
| - |
| -void PrerenderTabHelper::PasswordSubmitted(const autofill::PasswordForm& form) { |
| - PrerenderManager* prerender_manager = MaybeGetPrerenderManager(); |
| - if (prerender_manager) { |
| - prerender_manager->RecordLikelyLoginOnURL(form.origin); |
| - RecordEvent(EVENT_LOGIN_ACTION_ADDED); |
| - if (form.password_value.empty()) |
| - RecordEvent(EVENT_LOGIN_ACTION_ADDED_PW_EMPTY); |
| - } |
| } |
| PrerenderManager* PrerenderTabHelper::MaybeGetPrerenderManager() const { |
| @@ -217,39 +167,6 @@ void PrerenderTabHelper::WouldHavePrerenderedNextLoad(Origin origin) { |
| next_load_origin_ = origin; |
| } |
| -void PrerenderTabHelper::RecordEvent(PrerenderTabHelper::Event event) const { |
| - UMA_HISTOGRAM_ENUMERATION("Prerender.TabHelperEvent", |
| - event, PrerenderTabHelper::EVENT_MAX_VALUE); |
| -} |
| - |
| -void PrerenderTabHelper::RecordEventIfLoggedInURL( |
| - PrerenderTabHelper::Event event, const GURL& url) { |
| - PrerenderManager* prerender_manager = MaybeGetPrerenderManager(); |
| - if (!prerender_manager) |
| - return; |
| - scoped_ptr<bool> is_present(new bool); |
| - scoped_ptr<bool> lookup_succeeded(new bool); |
| - bool* is_present_ptr = is_present.get(); |
| - bool* lookup_succeeded_ptr = lookup_succeeded.get(); |
| - prerender_manager->CheckIfLikelyLoggedInOnURL( |
| - url, |
| - is_present_ptr, |
| - lookup_succeeded_ptr, |
| - base::Bind(&PrerenderTabHelper::RecordEventIfLoggedInURLResult, |
| - weak_factory_.GetWeakPtr(), |
| - event, |
| - base::Passed(&is_present), |
| - base::Passed(&lookup_succeeded))); |
| -} |
| - |
| -void PrerenderTabHelper::RecordEventIfLoggedInURLResult( |
| - PrerenderTabHelper::Event event, |
| - scoped_ptr<bool> is_present, |
| - scoped_ptr<bool> lookup_succeeded) { |
| - if (*lookup_succeeded && *is_present) |
| - RecordEvent(event); |
| -} |
| - |
| void PrerenderTabHelper::RecordPerceivedPageLoadTime( |
| base::TimeDelta perceived_page_load_time, |
| double fraction_plt_elapsed_at_swap_in) { |