| Index: chrome/browser/extensions/extensions_service.cc
|
| ===================================================================
|
| --- chrome/browser/extensions/extensions_service.cc (revision 66663)
|
| +++ chrome/browser/extensions/extensions_service.cc (working copy)
|
| @@ -538,7 +538,7 @@
|
| install_directory_(install_directory),
|
| extensions_enabled_(true),
|
| show_extensions_prompts_(true),
|
| - init_done_(false),
|
| + ready_(false),
|
| ALLOW_THIS_IN_INITIALIZER_LIST(toolbar_model_(this)),
|
| default_apps_(profile->GetPrefs()),
|
| event_routers_initialized_(false) {
|
| @@ -608,7 +608,7 @@
|
| void ExtensionsService::Init() {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
|
|
| - DCHECK(!init_done_); // Can't redo init.
|
| + DCHECK(!ready_);
|
| DCHECK_EQ(extensions_.size(), 0u);
|
|
|
| // Hack: we need to ensure the ResourceDispatcherHost is ready before we load
|
| @@ -623,8 +623,6 @@
|
|
|
| // TODO(erikkay) this should probably be deferred as well.
|
| GarbageCollectExtensions();
|
| -
|
| - init_done_ = true;
|
| }
|
|
|
| void ExtensionsService::InstallExtension(const FilePath& extension_path) {
|
| @@ -1475,6 +1473,7 @@
|
| }
|
|
|
| void ExtensionsService::OnLoadedInstalledExtensions() {
|
| + ready_ = true;
|
| if (updater_.get()) {
|
| updater_->Start();
|
| }
|
|
|