chrome/test/base/chrome_render_view_host_test_harness.cc - Issue 9033007: Rename the aura_shell namespace to ash

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/test/base/chrome_render_view_host_test_harness.cc

Issue 9033007: Rename the aura_shell namespace to ash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 12 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

« ash/accelerators/accelerator_controller.h ('K') | « chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.cc ('k') | chrome/test/base/view_event_test_base.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) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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/test/base/chrome_render_view_host_test_harness.h"	5 #include "chrome/test/base/chrome_render_view_host_test_harness.h"

6	6

7 #include "chrome/test/base/testing_profile.h"	7 #include "chrome/test/base/testing_profile.h"

8	8

9 #if defined(USE_AURA)	9 #if defined(USE_AURA)

10 #include "ash/shell.h"	10 #include "ash/shell.h"

(...skipping 13 matching lines...) Expand all Loading...
24	24

25 void ChromeRenderViewHostTestHarness::SetUp() {	25 void ChromeRenderViewHostTestHarness::SetUp() {

26 if (!browser_context_.get())	26 if (!browser_context_.get())

27 browser_context_.reset(new TestingProfile());	27 browser_context_.reset(new TestingProfile());

28 RenderViewHostTestHarness::SetUp();	28 RenderViewHostTestHarness::SetUp();

29 }	29 }

30	30

31 void ChromeRenderViewHostTestHarness::TearDown() {	31 void ChromeRenderViewHostTestHarness::TearDown() {

32 RenderViewHostTestHarness::TearDown();	32 RenderViewHostTestHarness::TearDown();

33 #if defined(USE_AURA)	33 #if defined(USE_AURA)

34 aura_shell::Shell::DeleteInstance();	34 ash::Shell::DeleteInstance();

35 aura::RootWindow::DeleteInstance();	35 aura::RootWindow::DeleteInstance();

36 #endif	36 #endif

37 }	37 }

OLD	NEW