summaryrefslogtreecommitdiffstats
path: root/chrome/browser/tab_contents
diff options
context:
space:
mode:
authorcbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-15 11:23:59 +0000
committercbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-15 11:23:59 +0000
commit4c154ff8753f6b9f87c289027bb00467a401be1e (patch)
tree061043819035973dab0350b83196af9c5291a538 /chrome/browser/tab_contents
parent6812c1135479958778b00bd8eb096d59e4e86035 (diff)
downloadchromium_src-4c154ff8753f6b9f87c289027bb00467a401be1e.zip
chromium_src-4c154ff8753f6b9f87c289027bb00467a401be1e.tar.gz
chromium_src-4c154ff8753f6b9f87c289027bb00467a401be1e.tar.bz2
Move FinalStatus out of PrerenderContents, and add prerender namespace.
I had a separate CL which wanted to record cancellations of prerenders which happened prior to a PrerenderContents object being created [in the PrerenderResourceHandler]. BUG=None TEST=trybots Review URL: http://codereview.chromium.org/6503008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74937 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents')
-rw-r--r--chrome/browser/tab_contents/tab_contents.cc4
-rw-r--r--chrome/browser/tab_contents/tab_contents.h11
2 files changed, 9 insertions, 6 deletions
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc
index 6d5a881..7ce24b3 100644
--- a/chrome/browser/tab_contents/tab_contents.cc
+++ b/chrome/browser/tab_contents/tab_contents.cc
@@ -368,7 +368,7 @@ TabContents::TabContents(Profile* profile,
AddObserver(autofill_manager_.get());
autocomplete_history_manager_.reset(new AutocompleteHistoryManager(this));
AddObserver(autocomplete_history_manager_.get());
- prerender_plt_recorder_.reset(new PrerenderPLTRecorder(this));
+ prerender_plt_recorder_.reset(new prerender::PrerenderPLTRecorder(this));
AddObserver(prerender_plt_recorder_.get());
AddObserver(&fav_icon_helper_);
AddObserver(printing_.get());
@@ -3130,7 +3130,7 @@ void TabContents::CreateViewAndSetSizeForRVH(RenderViewHost* rvh) {
}
bool TabContents::MaybeUsePreloadedPage(const GURL& url) {
- PrerenderManager* pm = profile()->GetPrerenderManager();
+ prerender::PrerenderManager* pm = profile()->GetPrerenderManager();
if (pm != NULL) {
if (pm->MaybeUsePreloadedPage(this, url))
return true;
diff --git a/chrome/browser/tab_contents/tab_contents.h b/chrome/browser/tab_contents/tab_contents.h
index 5118fc8..36f7343 100644
--- a/chrome/browser/tab_contents/tab_contents.h
+++ b/chrome/browser/tab_contents/tab_contents.h
@@ -49,6 +49,11 @@ namespace history {
class HistoryAddPageArgs;
}
+namespace prerender {
+class PrerenderManager;
+class PrerenderPLTRecorder;
+}
+
namespace printing {
class PrintPreviewMessageHandler;
class PrintViewManager;
@@ -67,8 +72,6 @@ class LoadNotificationDetails;
class OmniboxSearchHint;
class PluginObserver;
class Profile;
-class PrerenderManager;
-class PrerenderPLTRecorder;
class RenderViewHost;
class SessionStorageNamespace;
class SiteInstance;
@@ -747,7 +750,7 @@ class TabContents : public PageNavigator,
friend class ExternalTabContainer;
// Used to access RVH Delegates.
- friend class PrerenderManager;
+ friend class prerender::PrerenderManager;
// Message handlers.
void OnDidStartProvisionalLoadForFrame(int64 frame_id,
@@ -1072,7 +1075,7 @@ class TabContents : public PageNavigator,
scoped_ptr<PluginObserver> plugin_observer_;
// Prerender PageLoadTime Recorder.
- scoped_ptr<PrerenderPLTRecorder> prerender_plt_recorder_;
+ scoped_ptr<prerender::PrerenderPLTRecorder> prerender_plt_recorder_;
// TabContentsSSLHelper, lazily created.
scoped_ptr<TabContentsSSLHelper> ssl_helper_;