Delay default apps installation on Chrome OS for first time sign-in

chrome/browser/extensions/external_pref_loader.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/external_pref_loader.h"
 
 #include "base/bind.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"

[Nikita (slow), 2014/10/27 09:44:49]

#include "chrome/browser/profiles/profile.h"

[Dmitry Polukhin, 2014/10/27 14:48:48]

Discussed offline, I don't use Profile, only pass pointer.

 #include "base/path_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/prefs/pref_service_syncable.h"
 #include "chrome/common/chrome_paths.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 
 namespace {
 
 base::FilePath::CharType kExternalExtensionJson[] =
     FILE_PATH_LITERAL("external_extensions.json");
 
@@ skipping 55 matching lines @@
 
   LOG(WARNING) << "Expected a JSON dictionary in file "
                << path.value() << ".";
   return new base::DictionaryValue;
 }
 
 }  // namespace
 
 namespace extensions {
 
-ExternalPrefLoader::ExternalPrefLoader(int base_path_id, Options options)
-    : base_path_id_(base_path_id), options_(options) {
+ExternalPrefLoader::ExternalPrefLoader(int base_path_id,
+                                       Options options,
+                                       Profile* profile)
+    : base_path_id_(base_path_id), options_(options),

[Nikita (slow), 2014/10/27 09:44:49]

nit: one initialization per line now that they all don't fit on a single line.

or just run git cl format which is more convenient.

[Dmitry Polukhin, 2014/10/27 14:48:48]

Done.

+      profile_(profile), pref_observer_added_(false) {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 }
 
+ExternalPrefLoader::~ExternalPrefLoader() {
+  if (pref_observer_added_) {
+    PrefServiceSyncable* prefs = PrefServiceSyncable::FromProfile(profile_);
+    DCHECK(prefs);
+    prefs->RemoveObserver(this);
+  }
+}
+
 const base::FilePath ExternalPrefLoader::GetBaseCrxFilePath() {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // |base_path_| was set in LoadOnFileThread().
   return base_path_;
 }
 
 void ExternalPrefLoader::StartLoading() {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  BrowserThread::PostTask(
-      BrowserThread::FILE, FROM_HERE,
-      base::Bind(&ExternalPrefLoader::LoadOnFileThread, this));
+  if (options_ & DELAY_LOAD_UNTIL_PRIORITY_SYNC) {
+    if (!PostLoadIfPrioritySyncReady()) {
+      PrefServiceSyncable* prefs = PrefServiceSyncable::FromProfile(profile_);

[Nikita (slow), 2014/10/27 09:44:49]

nit: DCHECK(profile_);

[Dmitry Polukhin, 2014/10/27 14:48:48]

Done.

+      DCHECK(prefs);
+      prefs->AddObserver(this);
+      pref_observer_added_ = true;
+    }
+  } else {
+    BrowserThread::PostTask(
+        BrowserThread::FILE, FROM_HERE,

[Nikita (slow), 2014/10/27 09:44:49]

nit: As a follow up change you can get rid of FILE thread usage here.

+        base::Bind(&ExternalPrefLoader::LoadOnFileThread, this));
+  }
+}
+
+void ExternalPrefLoader::OnIsSyncingChanged() {
+  PostLoadIfPrioritySyncReady();
+}
+
+bool ExternalPrefLoader::PostLoadIfPrioritySyncReady() {
+  DCHECK(options_ & DELAY_LOAD_UNTIL_PRIORITY_SYNC);
+  DCHECK(profile_);
+
+  PrefServiceSyncable* prefs = PrefServiceSyncable::FromProfile(profile_);
+  DCHECK(prefs);
+  if (prefs->IsPrioritySyncing()) {
+    BrowserThread::PostTask(
+        BrowserThread::FILE, FROM_HERE,
+        base::Bind(&ExternalPrefLoader::LoadOnFileThread, this));
+    prefs->RemoveObserver(this);
+    pref_observer_added_ = false;
+    return true;
+  }
+
+  return false;
 }
 
 void ExternalPrefLoader::LoadOnFileThread() {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   scoped_ptr<base::DictionaryValue> prefs(new base::DictionaryValue);
 
   // TODO(skerner): Some values of base_path_id_ will cause
   // PathService::Get() to return false, because the path does
   // not exist.  Find and fix the build/install scripts so that
@@ skipping 125 matching lines @@
   LoadFinished();
 }
 
 ExternalTestingLoader::~ExternalTestingLoader() {}
 
 const base::FilePath ExternalTestingLoader::GetBaseCrxFilePath() {
   return fake_base_path_;
 }
 
 }  // namespace extensions