OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/browser_close_manager.h" | 5 #include "chrome/browser/lifetime/browser_close_manager.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <iterator> | 8 #include <iterator> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
11 #include "build/build_config.h" | 11 #include "build/build_config.h" |
12 #include "chrome/browser/background/background_mode_manager.h" | 12 #include "chrome/browser/background/background_mode_manager.h" |
13 #include "chrome/browser/browser_process.h" | 13 #include "chrome/browser/browser_process.h" |
14 #include "chrome/browser/browser_shutdown.h" | 14 #include "chrome/browser/browser_shutdown.h" |
15 #include "chrome/browser/download/download_service.h" | 15 #include "chrome/browser/download/download_service.h" |
16 #include "chrome/browser/download/download_service_factory.h" | 16 #include "chrome/browser/download/download_service_factory.h" |
| 17 #include "chrome/browser/lifetime/application_lifetime.h" |
17 #include "chrome/browser/notifications/notification_ui_manager.h" | 18 #include "chrome/browser/notifications/notification_ui_manager.h" |
18 #include "chrome/browser/profiles/profile_manager.h" | 19 #include "chrome/browser/profiles/profile_manager.h" |
19 #include "chrome/browser/ui/browser.h" | 20 #include "chrome/browser/ui/browser.h" |
20 #include "chrome/browser/ui/browser_list.h" | 21 #include "chrome/browser/ui/browser_list.h" |
21 #include "chrome/browser/ui/browser_window.h" | 22 #include "chrome/browser/ui/browser_window.h" |
22 #include "chrome/browser/ui/chrome_pages.h" | 23 #include "chrome/browser/ui/chrome_pages.h" |
23 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" | 24 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" |
24 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 25 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
25 #include "content/public/browser/web_contents.h" | 26 #include "content/public/browser/web_contents.h" |
26 | 27 |
(...skipping 28 matching lines...) Expand all Loading... |
55 return; | 56 return; |
56 } | 57 } |
57 TryToCloseBrowsers(); | 58 TryToCloseBrowsers(); |
58 } | 59 } |
59 | 60 |
60 void BrowserCloseManager::CancelBrowserClose() { | 61 void BrowserCloseManager::CancelBrowserClose() { |
61 browser_shutdown::SetTryingToQuit(false); | 62 browser_shutdown::SetTryingToQuit(false); |
62 for (auto* browser : *BrowserList::GetInstance()) { | 63 for (auto* browser : *BrowserList::GetInstance()) { |
63 browser->ResetBeforeUnloadHandlers(); | 64 browser->ResetBeforeUnloadHandlers(); |
64 } | 65 } |
| 66 chrome::ResetRestartPrefs(); |
| 67 BackgroundModeManager::SetShouldRestartInBackground(false); |
65 } | 68 } |
66 | 69 |
67 void BrowserCloseManager::TryToCloseBrowsers() { | 70 void BrowserCloseManager::TryToCloseBrowsers() { |
68 // If all browser windows can immediately be closed, fall out of this loop and | 71 // If all browser windows can immediately be closed, fall out of this loop and |
69 // close the browsers. If any browser window cannot be closed, temporarily | 72 // close the browsers. If any browser window cannot be closed, temporarily |
70 // stop closing. CallBeforeUnloadHandlers prompts the user and calls | 73 // stop closing. CallBeforeUnloadHandlers prompts the user and calls |
71 // OnBrowserReportCloseable with the result. If the user confirms the close, | 74 // OnBrowserReportCloseable with the result. If the user confirms the close, |
72 // this will trigger TryToCloseBrowsers to try again. | 75 // this will trigger TryToCloseBrowsers to try again. |
73 for (auto* browser : *BrowserList::GetInstance()) { | 76 for (auto* browser : *BrowserList::GetInstance()) { |
74 if (browser->CallBeforeUnloadHandlers( | 77 if (browser->CallBeforeUnloadHandlers( |
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
178 browser->window()->DestroyBrowser(); | 181 browser->window()->DestroyBrowser(); |
179 // Destroying the browser should have removed it from the browser list. | 182 // Destroying the browser should have removed it from the browser list. |
180 DCHECK(BrowserList::GetInstance()->end() == | 183 DCHECK(BrowserList::GetInstance()->end() == |
181 std::find(BrowserList::GetInstance()->begin(), | 184 std::find(BrowserList::GetInstance()->begin(), |
182 BrowserList::GetInstance()->end(), browser)); | 185 BrowserList::GetInstance()->end(), browser)); |
183 } | 186 } |
184 } | 187 } |
185 | 188 |
186 g_browser_process->notification_ui_manager()->CancelAll(); | 189 g_browser_process->notification_ui_manager()->CancelAll(); |
187 } | 190 } |
OLD | NEW |