chrome/browser/prerender/prerender_contents.cc - Issue 16387014: Use a direct include of utf_string_conversions.h in chrome/browser/, part 3.

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 16387014: Use a direct include of utf_string_conversions.h in chrome/browser/, part 3. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 6 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/prerender/prerender_browsertest.cc ('k') | chrome/browser/prerender/prerender_manager.cc » ('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 <functional>	8 #include <functional>

9 #include <utility>	9 #include <utility>

10	10

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

12 #include "chrome/browser/favicon/favicon_tab_helper.h"	12 #include "chrome/browser/favicon/favicon_tab_helper.h"

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

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

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

16 #include "chrome/browser/prerender/prerender_handle.h"	16 #include "chrome/browser/prerender/prerender_handle.h"

17 #include "chrome/browser/prerender/prerender_manager.h"	17 #include "chrome/browser/prerender/prerender_manager.h"

18 #include "chrome/browser/prerender/prerender_render_view_host_observer.h"	18 #include "chrome/browser/prerender/prerender_render_view_host_observer.h"

19 #include "chrome/browser/prerender/prerender_tracker.h"	19 #include "chrome/browser/prerender/prerender_tracker.h"

20 #include "chrome/browser/profiles/profile.h"	20 #include "chrome/browser/profiles/profile.h"

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

(...skipping 687 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
709	709

710 bool PrerenderContents::IsCrossSiteNavigationPending() const {	710 bool PrerenderContents::IsCrossSiteNavigationPending() const {

711 if (!prerender_contents_)	711 if (!prerender_contents_)

712 return false;	712 return false;

713 return (prerender_contents_->GetSiteInstance() !=	713 return (prerender_contents_->GetSiteInstance() !=

714 prerender_contents_->GetPendingSiteInstance());	714 prerender_contents_->GetPendingSiteInstance());

715 }	715 }

716	716

717	717

718 } // namespace prerender	718 } // namespace prerender

OLD	NEW