| Index: chrome/common/extensions/extension.cc
|
| diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc
|
| index 530c0beb16f845bde9cf984d4d89ff766ae69181..687d3f4e479f9b07761c8f6f13dd6f87ca739ad8 100644
|
| --- a/chrome/common/extensions/extension.cc
|
| +++ b/chrome/common/extensions/extension.cc
|
| @@ -133,7 +133,7 @@ const size_t kNumNonPermissionFunctionNames =
|
| // A singleton object containing global data needed by the extension objects.
|
| class ExtensionConfig {
|
| public:
|
| - static ExtensionConfig* GetSingleton() {
|
| + static ExtensionConfig* GetInstance() {
|
| return Singleton<ExtensionConfig>::get();
|
| }
|
|
|
| @@ -288,7 +288,7 @@ GURL Extension::GalleryUpdateUrl(bool secure) {
|
|
|
| // static
|
| int Extension::GetPermissionMessageId(const std::string& permission) {
|
| - return ExtensionConfig::GetSingleton()->GetPermissionMessageId(permission);
|
| + return ExtensionConfig::GetInstance()->GetPermissionMessageId(permission);
|
| }
|
|
|
| std::vector<string16> Extension::GetPermissionMessages() const {
|
| @@ -1975,7 +1975,7 @@ static std::string SizeToString(const gfx::Size& max_size) {
|
| void Extension::SetScriptingWhitelist(
|
| const std::vector<std::string>& whitelist) {
|
| ScriptingWhitelist* current_whitelist =
|
| - ExtensionConfig::GetSingleton()->whitelist();
|
| + ExtensionConfig::GetInstance()->whitelist();
|
| current_whitelist->clear();
|
| for (ScriptingWhitelist::const_iterator it = whitelist.begin();
|
| it != whitelist.end(); ++it) {
|
| @@ -2221,7 +2221,7 @@ bool Extension::CanExecuteScriptEverywhere() const {
|
| return true;
|
|
|
| ScriptingWhitelist* whitelist =
|
| - ExtensionConfig::GetSingleton()->whitelist();
|
| + ExtensionConfig::GetInstance()->whitelist();
|
|
|
| for (ScriptingWhitelist::const_iterator it = whitelist->begin();
|
| it != whitelist->end(); ++it) {
|
|
|