chrome/browser/tab_contents/render_view_host_manager.cc - Issue 150069: Move RenderViewHostManager back to tab_contents. Moving it to renderer_host...

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/tab_contents/render_view_host_manager.cc

Issue 150069: Move RenderViewHostManager back to tab_contents. Moving it to renderer_host... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 11 years, 5 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/tab_contents/render_view_host_manager.h ('k') | chrome/browser/tab_contents/render_view_host_manager_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2009 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/renderer_host/render_view_host_manager.h"	5 #include "chrome/browser/tab_contents/render_view_host_manager.h"

6	6

7 #include "base/command_line.h"	7 #include "base/command_line.h"

8 #include "base/logging.h"	8 #include "base/logging.h"

9 #include "chrome/browser/dom_ui/dom_ui.h"	9 #include "chrome/browser/dom_ui/dom_ui.h"

10 #include "chrome/browser/dom_ui/dom_ui_factory.h"	10 #include "chrome/browser/dom_ui/dom_ui_factory.h"

11 #include "chrome/browser/renderer_host/render_view_host.h"	11 #include "chrome/browser/renderer_host/render_view_host.h"

12 #include "chrome/browser/renderer_host/render_view_host_delegate.h"	12 #include "chrome/browser/renderer_host/render_view_host_delegate.h"

13 #include "chrome/browser/renderer_host/render_view_host_factory.h"	13 #include "chrome/browser/renderer_host/render_view_host_factory.h"

14 #include "chrome/browser/renderer_host/render_widget_host_view.h"	14 #include "chrome/browser/renderer_host/render_widget_host_view.h"

15 #include "chrome/browser/renderer_host/site_instance.h"	15 #include "chrome/browser/renderer_host/site_instance.h"

(...skipping 587 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
603 pending_renderer_aborted_ = false;	603 pending_renderer_aborted_ = false;

604 pending_dom_ui_.reset();	604 pending_dom_ui_.reset();

605 }	605 }

606	606

607 void RenderViewHostManager::CrossSiteNavigationCanceled() {	607 void RenderViewHostManager::CrossSiteNavigationCanceled() {

608 DCHECK(cross_navigation_pending_);	608 DCHECK(cross_navigation_pending_);

609 cross_navigation_pending_ = false;	609 cross_navigation_pending_ = false;

610 if (pending_render_view_host_)	610 if (pending_render_view_host_)

611 CancelPending();	611 CancelPending();

612 }	612 }

OLD	NEW