diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-25 01:27:31 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-25 01:27:31 +0000 |
| commit | 04999e660bef3b6df5518acea9749878af736b8e (patch) | |
| tree | 9dcc816280dfd032b39a40813bfdb6a7fdca7793 /chrome/browser/browser_shutdown.cc | |
| parent | 26f34dd42f1af46a4c68e9082290c359706685db (diff) | |
| download | chromium_src-04999e660bef3b6df5518acea9749878af736b8e.zip chromium_src-04999e660bef3b6df5518acea9749878af736b8e.tar.gz chromium_src-04999e660bef3b6df5518acea9749878af736b8e.tar.bz2 | |
linux: drop temp_scaffolding_stubs
It was mostly unneeded, but I had to excise the last bits of RLZ and move
some NOTIMPLEMENTED bits to where they belong.
Review URL: http://codereview.chromium.org/219042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27161 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_shutdown.cc')
| -rw-r--r-- | chrome/browser/browser_shutdown.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome/browser/browser_shutdown.cc b/chrome/browser/browser_shutdown.cc index 971b262..3e8622a 100644 --- a/chrome/browser/browser_shutdown.cc +++ b/chrome/browser/browser_shutdown.cc @@ -22,13 +22,15 @@ #include "chrome/browser/renderer_host/render_process_host.h" #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/renderer_host/render_widget_host.h" -#include "chrome/browser/rlz/rlz.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/common/chrome_plugin_lib.h" #include "net/dns_global.h" +#if defined(OS_WIN) +#include "chrome/browser/rlz/rlz.h" +#endif using base::Time; using base::TimeDelta; @@ -131,9 +133,11 @@ void Shutdown() { prefs->SavePersistentPrefs(); +#if defined(OS_WIN) // Cleanup any statics created by RLZ. Must be done before NotificationService // is destroyed. RLZTracker::CleanupRlz(); +#endif // The jank'o'meter requires that the browser process has been destroyed // before calling UninstallJankometer(). @@ -146,11 +150,11 @@ void Shutdown() { if (delete_resources_on_shutdown) ResourceBundle::CleanupSharedInstance(); +#if defined(OS_WIN) if (!Upgrade::IsBrowserAlreadyRunning()) { Upgrade::SwapNewChromeExeIfPresent(); } -#if defined(OS_WIN) if (shutdown_type_ > NOT_VALID && shutdown_num_processes_ > 0) { // Measure total shutdown time as late in the process as possible // and then write it to a file to be read at startup. |