chrome/browser/prerender/prerender_contents.cc - Issue 9114020: Remove task.h and finish base::Bind() migration.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/prerender/prerender_contents.cc

Issue 9114020: Remove task.h and finish base::Bind() migration. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix typo Created 8 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/platform_util_chromeos.cc ('k') | chrome/browser/prerender/prerender_manager.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/prerender/prerender_contents.h"	5 #include "chrome/browser/prerender/prerender_contents.h"

6	6

7 #include <algorithm>	7 #include <algorithm>

8 #include <utility>	8 #include <utility>

9	9

10 #include "base/process_util.h"	10 #include "base/process_util.h"

11 #include "base/task.h"

12 #include "base/utf_string_conversions.h"	11 #include "base/utf_string_conversions.h"

13 #include "chrome/browser/history/history_tab_helper.h"	12 #include "chrome/browser/history/history_tab_helper.h"

14 #include "chrome/browser/history/history_types.h"	13 #include "chrome/browser/history/history_types.h"

15 #include "chrome/browser/prerender/prerender_final_status.h"	14 #include "chrome/browser/prerender/prerender_final_status.h"

16 #include "chrome/browser/prerender/prerender_manager.h"	15 #include "chrome/browser/prerender/prerender_manager.h"

17 #include "chrome/browser/prerender/prerender_render_view_host_observer.h"	16 #include "chrome/browser/prerender/prerender_render_view_host_observer.h"

18 #include "chrome/browser/prerender/prerender_tracker.h"	17 #include "chrome/browser/prerender/prerender_tracker.h"

19 #include "chrome/browser/profiles/profile.h"	18 #include "chrome/browser/profiles/profile.h"

20 #include "chrome/browser/ui/browser.h"	19 #include "chrome/browser/ui/browser.h"

21 #include "chrome/browser/ui/browser_list.h"	20 #include "chrome/browser/ui/browser_list.h"

(...skipping 673 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
695 bool PrerenderContents::IsCrossSiteNavigationPending() const {	694 bool PrerenderContents::IsCrossSiteNavigationPending() const {

696 if (!prerender_contents_.get() \|\| !prerender_contents_->web_contents())	695 if (!prerender_contents_.get() \|\| !prerender_contents_->web_contents())

697 return false;	696 return false;

698 const WebContents* web_contents = prerender_contents_->web_contents();	697 const WebContents* web_contents = prerender_contents_->web_contents();

699 return (web_contents->GetSiteInstance() !=	698 return (web_contents->GetSiteInstance() !=

700 web_contents->GetPendingSiteInstance());	699 web_contents->GetPendingSiteInstance());

701 }	700 }

702	701

703	702

704 } // namespace prerender	703 } // namespace prerender

OLD	NEW