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/lifetime/application_lifetime.h" | 5 #include "chrome/browser/lifetime/application_lifetime.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "chrome/common/chrome_switches.h" | 8 #include "chrome/common/chrome_switches.h" |
9 #include "chrome/common/switch_utils.h" | |
9 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
10 #include "chrome/browser/notifications/notification_ui_manager.h" | 11 #include "chrome/browser/notifications/notification_ui_manager.h" |
11 #include "ui/views/widget/widget.h" | 12 #include "ui/views/widget/widget.h" |
12 | 13 |
13 #if defined(USE_ASH) | 14 #if defined(USE_ASH) |
14 #include "ash/shell.h" | 15 #include "ash/shell.h" |
15 #include "ui/aura/client/capture_client.h" | 16 #include "ui/aura/client/capture_client.h" |
16 #endif | 17 #endif |
17 | 18 |
18 namespace browser { | 19 namespace browser { |
(...skipping 12 matching lines...) Expand all Loading... | |
31 SetCapture(NULL); | 32 SetCapture(NULL); |
32 } | 33 } |
33 #else | 34 #else |
34 g_browser_process->notification_ui_manager()->CancelAll(); | 35 g_browser_process->notification_ui_manager()->CancelAll(); |
35 #endif | 36 #endif |
36 | 37 |
37 views::Widget::CloseAllSecondaryWidgets(); | 38 views::Widget::CloseAllSecondaryWidgets(); |
38 | 39 |
39 #if defined(OS_CHROMEOS) | 40 #if defined(OS_CHROMEOS) |
40 if (!CommandLine::ForCurrentProcess()->HasSwitch( | 41 if (!CommandLine::ForCurrentProcess()->HasSwitch( |
41 switches::kDisableZeroBrowsersOpenForTests)) { | 42 switches::kDisableZeroBrowsersOpenForTests) && |
43 !switches::IsRunningInAppMode()) { | |
42 // App is exiting, call EndKeepAlive() on behalf of Aura Shell. | 44 // App is exiting, call EndKeepAlive() on behalf of Aura Shell. |
43 EndKeepAlive(); | 45 EndKeepAlive(); |
44 // Make sure we have notified the session manager that we are exiting. | 46 // Make sure we have notified the session manager that we are exiting. |
45 // This might be called from FastShutdown() or CloseAllBrowsers(), but not | 47 // This might be called from FastShutdown() or CloseAllBrowsers(), but not |
46 // if something prevents a browser from closing before SetTryingToQuit() | 48 // if something prevents a browser from closing before SetTryingToQuit() |
47 // gets called (e.g. browser->TabsNeedBeforeUnloadFired() is true). | 49 // gets called (e.g. browser->TabsNeedBeforeUnloadFired() is true). |
48 // NotifyAndTerminate does nothing if called more than once. | 50 // NotifyAndTerminate does nothing if called more than once. |
49 NotifyAndTerminate(true); | 51 NotifyAndTerminate(true); |
oshima
2013/01/30 22:08:20
just FYI: I'm 100% sure if you can skip this one o
zel
2013/01/30 22:26:52
works fine with this in place
| |
50 } | 52 } |
51 #endif // OS_CHROMEOS | 53 #endif // OS_CHROMEOS |
52 } | 54 } |
53 | 55 |
54 } // namespace browser | 56 } // namespace browser |
OLD | NEW |