chrome/browser/notifications/desktop_notifications_unittest.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: chrome/browser/notifications/desktop_notifications_unittest.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

« no previous file with comments | « chrome/browser/chrome_browser_main_extra_parts_aura.cc ('k') | chrome/browser/ui/views/accessibility_event_router_views_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/notifications/desktop_notifications_unittest.cc

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

--- chrome/browser/notifications/desktop_notifications_unittest.cc (revision 124478)

+++ chrome/browser/notifications/desktop_notifications_unittest.cc (working copy)

@@ -95,7 +95,7 @@

WebKit::initialize(&webkit_platform_support_);

// MockBalloonCollection retrieves information about the screen on creation.

// So it is necessary to make sure the desktop gets created first.

- ash::Shell::CreateInstance(NULL);

+ ash::Shell::GetRootWindow();

#endif

browser::RegisterLocalState(&local_state_);

@@ -112,7 +112,7 @@

ui_manager_.reset(NULL);

profile_.reset(NULL);

#if defined(USE_AURA)

- ash::Shell::DeleteInstance();

+ aura::RootWindow::DeleteInstance();

aura::Env::DeleteInstance();

WebKit::shutdown();

#endif