Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(508)

Unified Diff: chrome/browser/media_galleries/media_galleries_preferences.cc

Issue 86743002: [MediaGalleries] Enable iPhoto gallery (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Take out logging -- found race Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 b7df25c8a6d3493eafe38dbacc541f25433ead73..5cf9d2107cc705b46daa50019529ad8658488f23 100644
--- a/chrome/browser/media_galleries/media_galleries_preferences.cc
+++ b/chrome/browser/media_galleries/media_galleries_preferences.cc
@@ -401,7 +401,7 @@ void MediaGalleriesPreferences::EnsureInitialized(base::Closure callback) {
// It cannot be incremented inline with each callback, as some may return
// synchronously, decrement the counter to 0, and prematurely trigger
// FinishInitialization.
- pre_initialization_callbacks_waiting_ = 3;
+ pre_initialization_callbacks_waiting_ = 4;
// Check whether we should be initializing -- are there any extensions that
// are using media galleries?
@@ -426,11 +426,9 @@ void MediaGalleriesPreferences::EnsureInitialized(base::Closure callback) {
base::Bind(&MediaGalleriesPreferences::OnFinderDeviceID,
weak_factory_.GetWeakPtr()));
-#if 0
iapps::FindIPhotoLibrary(
base::Bind(&MediaGalleriesPreferences::OnFinderDeviceID,
weak_factory_.GetWeakPtr()));
-#endif
}
bool MediaGalleriesPreferences::IsInitialized() const { return initialized_; }

Powered by Google App Engine
This is Rietveld 408576698