Index: chrome/browser/media_galleries/media_galleries_preferences.cc |
diff --git a/chrome/browser/media_galleries/media_galleries_preferences.cc b/chrome/browser/media_galleries/media_galleries_preferences.cc |
index c4466ad43c61dfb383f9b2a8f5831f2cd4939e49..ab571811c6f11c3416daf5fd3bc5af3cde00d178 100644 |
--- a/chrome/browser/media_galleries/media_galleries_preferences.cc |
+++ b/chrome/browser/media_galleries/media_galleries_preferences.cc |
@@ -341,12 +341,9 @@ MediaGalleriesPreferences::MediaGalleriesPreferences(Profile* profile) |
base::Bind(&MediaGalleriesPreferences::OnITunesDeviceID, |
weak_factory_.GetWeakPtr())); |
- // TODO(tommycli): Turn on when Picasa code is ready. |
-#if 0 |
- picasa::PicasaFinder::FindPicasaDatabaseOnUIThread( |
+ picasa::PicasaFinder::FindPicasaDatabase( |
tommycli
2013/09/16 19:35:45
Currently requires it to be 'on' for browser test
vandebo (ex-Chrome)
2013/09/17 21:18:06
This seems fine, just don't land it before the bra
|
base::Bind(&MediaGalleriesPreferences::OnPicasaDeviceID, |
weak_factory_.GetWeakPtr())); |
-#endif |
InitFromPrefs(false /*no notification*/); |