diff options
| author | gavinp@chromium.org <gavinp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-16 22:26:07 +0000 |
|---|---|---|
| committer | gavinp@chromium.org <gavinp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-16 22:26:07 +0000 |
| commit | 053566af2ee54e9b5cb0ef5d2255b62a3ae300de (patch) | |
| tree | 9aafe0ae1a07eb8766e5ae83f6df6c408c2ec381 | |
| parent | a2bc1342db6a2f19e59a87adc6e744492a97f2c9 (diff) | |
| download | chromium_src-053566af2ee54e9b5cb0ef5d2255b62a3ae300de.zip chromium_src-053566af2ee54e9b5cb0ef5d2255b62a3ae300de.tar.gz chromium_src-053566af2ee54e9b5cb0ef5d2255b62a3ae300de.tar.bz2 | |
Style cleanups in PrerenderLinkManager.
Removed an unneeded include.
Change a crazy std::pair initialization to use a static_cast<> rather than an automatic null value.
R=pkasting@chromium.org
BUG=None
Review URL: https://chromiumcodereview.appspot.com/10793002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146906 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/prerender/prerender_link_manager.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/prerender/prerender_link_manager.cc b/chrome/browser/prerender/prerender_link_manager.cc index 76f6c19..d170b8f 100644 --- a/chrome/browser/prerender/prerender_link_manager.cc +++ b/chrome/browser/prerender/prerender_link_manager.cc @@ -8,7 +8,6 @@ #include <queue> #include <utility> -#include "base/basictypes.h" #include "chrome/browser/prerender/prerender_contents.h" #include "chrome/browser/prerender/prerender_handle.h" #include "chrome/browser/prerender/prerender_manager.h" @@ -66,10 +65,9 @@ bool PrerenderLinkManager::OnAddPrerender(int child_id, manager_->AddPrerenderFromLinkRelPrerender( child_id, render_view_route_id, url, referrer, size)); if (prerender_handle.get()) { - PrerenderHandle* null = NULL; std::pair<IdPairToPrerenderHandleMap::iterator, bool> insert_result = - ids_to_handle_map_.insert(IdPairToPrerenderHandleMap::value_type( - child_and_prerender_id, null)); + ids_to_handle_map_.insert(std::make_pair( + child_and_prerender_id, static_cast<PrerenderHandle*>(NULL))); DCHECK(insert_result.second); delete insert_result.first->second; insert_result.first->second = prerender_handle.release(); |