| Index: chrome/browser/extensions/extension_toolbar_model.cc
|
| ===================================================================
|
| --- chrome/browser/extensions/extension_toolbar_model.cc (revision 66663)
|
| +++ chrome/browser/extensions/extension_toolbar_model.cc (working copy)
|
| @@ -90,6 +90,9 @@
|
| return;
|
| }
|
|
|
| + if (!service_->is_ready())
|
| + return;
|
| +
|
| const Extension* extension = Details<const Extension>(details).ptr();
|
| if (type == NotificationType::EXTENSION_LOADED) {
|
| AddExtension(extension);
|
| @@ -148,6 +151,8 @@
|
| // 2. Create a vector of extensions that did not have a pref value.
|
| // 3. Remove holes from the sorted vector and append the unsorted vector.
|
| void ExtensionToolbarModel::InitializeExtensionList() {
|
| + DCHECK(service_->is_ready());
|
| +
|
| std::vector<std::string> pref_order = service_->extension_prefs()->
|
| GetToolbarOrder();
|
| // Items that have a pref for their position.
|
|
|