ash/shell/shell_main.cc - Issue 9535025: Remove the singleton instance get/delete methods from RootWindow (yay)

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: ash/shell/shell_main.cc

Issue 9535025: 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, 9 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:

« no previous file with comments | « ash/shell.cc ('k') | ash/test/ash_test_base.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 <map>	5 #include <map>

6	6

7 #include "ash/launcher/launcher.h"	7 #include "ash/launcher/launcher.h"

8 #include "ash/launcher/launcher_delegate.h"	8 #include "ash/launcher/launcher_delegate.h"

9 #include "ash/launcher/launcher_model.h"	9 #include "ash/launcher/launcher_model.h"

10 #include "ash/launcher/launcher_types.h"	10 #include "ash/launcher/launcher_types.h"

(...skipping 250 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
261	261

262 ash::shell::InitWindowTypeLauncher();	262 ash::shell::InitWindowTypeLauncher();

263	263

264 ash::Shell::GetRootWindow()->ShowRootWindow();	264 ash::Shell::GetRootWindow()->ShowRootWindow();

265 MessageLoopForUI::current()->Run();	265 MessageLoopForUI::current()->Run();

266	266

267 window_watcher.reset();	267 window_watcher.reset();

268	268

269 ash::Shell::DeleteInstance();	269 ash::Shell::DeleteInstance();

270	270

271 aura::RootWindow::DeleteInstance();

272 aura::Env::DeleteInstance();	271 aura::Env::DeleteInstance();

273	272

274 ui::CompositorTestSupport::Terminate();	273 ui::CompositorTestSupport::Terminate();

275	274

276 return 0;	275 return 0;

277 }	276 }

OLD	NEW