| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/browser_shutdown.h" | 5 #include "chrome/browser/browser_shutdown.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 173 } | 173 } |
| 174 | 174 |
| 175 prefs->SavePersistentPrefs(); | 175 prefs->SavePersistentPrefs(); |
| 176 | 176 |
| 177 #if defined(OS_WIN) && defined(GOOGLE_CHROME_BUILD) | 177 #if defined(OS_WIN) && defined(GOOGLE_CHROME_BUILD) |
| 178 // Cleanup any statics created by RLZ. Must be done before NotificationService | 178 // Cleanup any statics created by RLZ. Must be done before NotificationService |
| 179 // is destroyed. | 179 // is destroyed. |
| 180 RLZTracker::CleanupRlz(); | 180 RLZTracker::CleanupRlz(); |
| 181 #endif | 181 #endif |
| 182 | 182 |
| 183 profile_manager->ClearAppCaches(); |
| 184 |
| 183 // The jank'o'meter requires that the browser process has been destroyed | 185 // The jank'o'meter requires that the browser process has been destroyed |
| 184 // before calling UninstallJankometer(). | 186 // before calling UninstallJankometer(). |
| 185 delete g_browser_process; | 187 delete g_browser_process; |
| 186 g_browser_process = NULL; | 188 g_browser_process = NULL; |
| 187 #if defined(OS_CHROMEOS) | 189 #if defined(OS_CHROMEOS) |
| 188 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("BrowserDeleted", | 190 chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("BrowserDeleted", |
| 189 true); | 191 true); |
| 190 #endif | 192 #endif |
| 191 | 193 |
| 192 // Uninstall Jank-O-Meter here after the IO thread is no longer running. | 194 // Uninstall Jank-O-Meter here after the IO thread is no longer running. |
| (...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 329 | 331 |
| 330 bool ShuttingDownWithoutClosingBrowsers() { | 332 bool ShuttingDownWithoutClosingBrowsers() { |
| 331 #if defined(USE_X11) | 333 #if defined(USE_X11) |
| 332 if (GetShutdownType() == browser_shutdown::END_SESSION) | 334 if (GetShutdownType() == browser_shutdown::END_SESSION) |
| 333 return true; | 335 return true; |
| 334 #endif | 336 #endif |
| 335 return false; | 337 return false; |
| 336 } | 338 } |
| 337 | 339 |
| 338 } // namespace browser_shutdown | 340 } // namespace browser_shutdown |
| OLD | NEW |