chrome/browser/ui/ash/ash_init.cc - Issue 205963005: Delete "shutdown without closing browsers" path

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/ui/ash/ash_init.cc

Issue 205963005: Delete "shutdown without closing browsers" path (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 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:

View unified diff | Download patch | Annotate | Revision Log

« ash/shell_delegate.h ('K') | « chrome/browser/lifetime/application_lifetime.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate.h » ('j') | chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 "chrome/browser/ui/ash/ash_init.h"	5 #include "chrome/browser/ui/ash/ash_init.h"

6	6

7 #include "ash/accelerators/accelerator_controller.h"	7 #include "ash/accelerators/accelerator_controller.h"

8 #include "ash/ash_switches.h"	8 #include "ash/ash_switches.h"

9 #include "ash/high_contrast/high_contrast_controller.h"	9 #include "ash/high_contrast/high_contrast_controller.h"

10 #include "ash/magnifier/magnification_controller.h"	10 #include "ash/magnifier/magnification_controller.h"

(...skipping 65 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
76	76

77 if (!CommandLine::ForCurrentProcess()->HasSwitch(	77 if (!CommandLine::ForCurrentProcess()->HasSwitch(

78 switches::kDisableZeroBrowsersOpenForTests)) {	78 switches::kDisableZeroBrowsersOpenForTests)) {

79 chrome::IncrementKeepAliveCount();	79 chrome::IncrementKeepAliveCount();

80 }	80 }

81 #endif	81 #endif

82 ash::Shell::GetPrimaryRootWindow()->GetHost()->Show();	82 ash::Shell::GetPrimaryRootWindow()->GetHost()->Show();

83 }	83 }

84	84

85 void CloseAsh() {	85 void CloseAsh() {

86 // If shutdown is initiated by \|BrowserX11IOErrorHandler\|, don't	86 if (ash::Shell::HasInstance())

87 // try to cleanup resources.

88 if (!browser_shutdown::ShuttingDownWithoutClosingBrowsers() &&

89 ash::Shell::HasInstance()) {

90 ash::Shell::DeleteInstance();	87 ash::Shell::DeleteInstance();

91 }

92 }	88 }

93	89

94 } // namespace chrome	90 } // namespace chrome

OLD	NEW