summaryrefslogtreecommitdiffstats
path: root/chrome/browser/prerender/prerender_contents.cc
diff options
context:
space:
mode:
authorgavinp@chromium.org <gavinp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-29 16:29:07 +0000
committergavinp@chromium.org <gavinp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-29 16:29:07 +0000
commitcfd820d35f54b547460427055b43e78db22c00f7 (patch)
tree572d7484f5b9970d7938ab056d16d9fbc4400331 /chrome/browser/prerender/prerender_contents.cc
parent233633f7e87a4095b9b82e52eaf16a47a6bf8e59 (diff)
downloadchromium_src-cfd820d35f54b547460427055b43e78db22c00f7.zip
chromium_src-cfd820d35f54b547460427055b43e78db22c00f7.tar.gz
chromium_src-cfd820d35f54b547460427055b43e78db22c00f7.tar.bz2
Change PrerenderContents::render_view_host from hacker_style to StudlyCaps.
See http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml?showone=Function_Names#Function_Names Those hacker_style functions were not free like member access, so StudlyTheyMustBe. BUG=None Review URL: http://codereview.chromium.org/10270003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134496 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prerender/prerender_contents.cc')
-rw-r--r--chrome/browser/prerender/prerender_contents.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/chrome/browser/prerender/prerender_contents.cc b/chrome/browser/prerender/prerender_contents.cc
index aefc32e..098a67a 100644
--- a/chrome/browser/prerender/prerender_contents.cc
+++ b/chrome/browser/prerender/prerender_contents.cc
@@ -322,10 +322,10 @@ void PrerenderContents::StartPrerendering(
// Register as an observer of the RenderViewHost so we get messages.
render_view_host_observer_.reset(
- new PrerenderRenderViewHostObserver(this, render_view_host_mutable()));
+ new PrerenderRenderViewHostObserver(this, GetRenderViewHostMutable()));
- child_id_ = render_view_host()->GetProcess()->GetID();
- route_id_ = render_view_host()->GetRoutingID();
+ child_id_ = GetRenderViewHost()->GetProcess()->GetID();
+ route_id_ = GetRenderViewHost()->GetRoutingID();
// Register this with the ResourceDispatcherHost as a prerender
// RenderViewHost. This must be done before the Navigate message to catch all
@@ -634,9 +634,9 @@ void PrerenderContents::Destroy(FinalStatus final_status) {
base::ProcessMetrics* PrerenderContents::MaybeGetProcessMetrics() {
if (process_metrics_.get() == NULL) {
// If a PrenderContents hasn't started prerending, don't be fully formed.
- if (!render_view_host() || !render_view_host()->GetProcess())
+ if (!GetRenderViewHost() || !GetRenderViewHost()->GetProcess())
return NULL;
- base::ProcessHandle handle = render_view_host()->GetProcess()->GetHandle();
+ base::ProcessHandle handle = GetRenderViewHost()->GetProcess()->GetHandle();
if (handle == base::kNullProcessHandle)
return NULL;
#if !defined(OS_MACOSX)
@@ -676,11 +676,11 @@ WebContents* PrerenderContents::GetWebContents() {
return prerender_contents_->web_contents();
}
-RenderViewHost* PrerenderContents::render_view_host_mutable() {
- return const_cast<RenderViewHost*>(render_view_host());
+RenderViewHost* PrerenderContents::GetRenderViewHostMutable() {
+ return const_cast<RenderViewHost*>(GetRenderViewHost());
}
-const RenderViewHost* PrerenderContents::render_view_host() const {
+const RenderViewHost* PrerenderContents::GetRenderViewHost() const {
if (!prerender_contents_.get())
return NULL;
return prerender_contents_->web_contents()->GetRenderViewHost();