| Index: chrome/browser/extensions/extension_toolbar_model.cc
|
| diff --git a/chrome/browser/extensions/extension_toolbar_model.cc b/chrome/browser/extensions/extension_toolbar_model.cc
|
| index c777427da59f2075a2d2476ce7cb5abd81d5d7db..4289913b30fde633297a5d3d470c8c6c5fec03c9 100644
|
| --- a/chrome/browser/extensions/extension_toolbar_model.cc
|
| +++ b/chrome/browser/extensions/extension_toolbar_model.cc
|
| @@ -5,14 +5,14 @@
|
| #include "chrome/browser/extensions/extension_toolbar_model.h"
|
|
|
| #include "chrome/browser/extensions/extension_prefs.h"
|
| -#include "chrome/browser/extensions/extensions_service.h"
|
| +#include "chrome/browser/extensions/extension_service.h"
|
| #include "chrome/browser/prefs/pref_service.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/common/extensions/extension.h"
|
| #include "chrome/common/notification_service.h"
|
| #include "chrome/common/pref_names.h"
|
|
|
| -ExtensionToolbarModel::ExtensionToolbarModel(ExtensionsService* service)
|
| +ExtensionToolbarModel::ExtensionToolbarModel(ExtensionService* service)
|
| : service_(service),
|
| prefs_(service->profile()->GetPrefs()),
|
| extensions_initialized_(false) {
|
| @@ -160,7 +160,7 @@ void ExtensionToolbarModel::RemoveExtension(const Extension* extension) {
|
| }
|
|
|
| // Combine the currently enabled extensions that have browser actions (which
|
| -// we get from the ExtensionsService) with the ordering we get from the
|
| +// we get from the ExtensionService) with the ordering we get from the
|
| // pref service. For robustness we use a somewhat inefficient process:
|
| // 1. Create a vector of extensions sorted by their pref values. This vector may
|
| // have holes.
|
|
|