Index: chrome/browser/chromeos/gdata/gdata_download_observer.h |
diff --git a/chrome/browser/chromeos/gdata/gdata_download_observer.h b/chrome/browser/chromeos/gdata/gdata_download_observer.h |
index ece654dbc4f075fb9b631b36647ab76e22617c89..51bb00becc41ce12d5323a6594ef5b255fd7f1d9 100644 |
--- a/chrome/browser/chromeos/gdata/gdata_download_observer.h |
+++ b/chrome/browser/chromeos/gdata/gdata_download_observer.h |
@@ -2,8 +2,8 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef CHROME_BROWSER_CHROMEOS_GDATA_GDATA_DOWNLOAD_OBSERVER_H__ |
-#define CHROME_BROWSER_CHROMEOS_GDATA_GDATA_DOWNLOAD_OBSERVER_H__ |
+#ifndef CHROME_BROWSER_CHROMEOS_GDATA_GDATA_DOWNLOAD_OBSERVER_H_ |
+#define CHROME_BROWSER_CHROMEOS_GDATA_GDATA_DOWNLOAD_OBSERVER_H_ |
#include <map> |
@@ -155,6 +155,8 @@ class GDataDownloadObserver : public content::DownloadManager::Observer, |
typedef std::map<int32, content::DownloadItem*> DownloadMap; |
DownloadMap pending_downloads_; |
+ // Note: This should remain the last member so it'll be destroyed and |
+ // invalidate its weak pointers before any other members are destroyed. |
base::WeakPtrFactory<GDataDownloadObserver> weak_ptr_factory_; |
DISALLOW_COPY_AND_ASSIGN(GDataDownloadObserver); |
@@ -162,4 +164,4 @@ class GDataDownloadObserver : public content::DownloadManager::Observer, |
} // namespace gdata |
-#endif // CHROME_BROWSER_CHROMEOS_GDATA_GDATA_DOWNLOAD_OBSERVER_H__ |
+#endif // CHROME_BROWSER_CHROMEOS_GDATA_GDATA_DOWNLOAD_OBSERVER_H_ |