content/browser/renderer_host/test_render_view_host.cc - Issue 9564023: Revert 124461 - Remove the singleton instance get/delete methods from RootWindow (yay)

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

Unified Diff: content/browser/renderer_host/test_render_view_host.cc

Issue 9564023: Revert 124461 - Remove the singleton instance get/delete methods from RootWindow (yay) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 10 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 side-by-side diff with in-line comments

Download patch

Index: content/browser/renderer_host/test_render_view_host.cc

===================================================================

--- content/browser/renderer_host/test_render_view_host.cc (revision 124478)

+++ content/browser/renderer_host/test_render_view_host.cc (working copy)

@@ -400,9 +400,8 @@

void RenderViewHostTestHarness::SetUp() {

#if defined(USE_AURA)

- root_window_.reset(new aura::RootWindow);

- test_stacking_client_.reset(

- new aura::test::TestStackingClient(root_window_.get()));

+ aura::RootWindow* root_window = aura::RootWindow::GetInstance();

+ test_stacking_client_.reset(new aura::test::TestStackingClient(root_window));

#endif

SetContents(CreateTestTabContents());

}

@@ -411,7 +410,6 @@

SetContents(NULL);

#if defined(USE_AURA)

test_stacking_client_.reset();

- root_window_.reset();

#endif

// Make sure that we flush any messages related to TabContents destruction

« no previous file with comments | « content/browser/renderer_host/test_render_view_host.h ('k') | ui/aura/demo/demo_main.cc » ('j') | no next file with comments »