| Index: chrome/browser/extensions/extensions_ui.cc
|
| diff --git a/chrome/browser/extensions/extensions_ui.cc b/chrome/browser/extensions/extensions_ui.cc
|
| index c74d07a4201cddaae79c3823724b9b4ce04973ea..782ef6f8292bf449bd50f0926dc875d440f6418e 100644
|
| --- a/chrome/browser/extensions/extensions_ui.cc
|
| +++ b/chrome/browser/extensions/extensions_ui.cc
|
| @@ -242,8 +242,10 @@ void ExtensionsDOMHandler::HandleRequestExtensionsData(const ListValue* args) {
|
| }
|
| results.Set("extensions", extensions_list);
|
|
|
| - bool developer_mode = web_ui_->GetProfile()->GetPrefs()
|
| - ->GetBoolean(prefs::kExtensionsUIDeveloperMode);
|
| + Profile* profile =
|
| + Profile::FromBrowserContext(web_ui_->tab_contents()->browser_context());
|
| + bool developer_mode =
|
| + profile->GetPrefs()->GetBoolean(prefs::kExtensionsUIDeveloperMode);
|
| results.SetBoolean("developerMode", developer_mode);
|
|
|
| web_ui_->CallJavascriptFunction("returnExtensionsData", results);
|
| @@ -281,17 +283,21 @@ void ExtensionsDOMHandler::RegisterForNotifications() {
|
|
|
| ExtensionUninstallDialog* ExtensionsDOMHandler::GetExtensionUninstallDialog() {
|
| if (!extension_uninstall_dialog_.get()) {
|
| + Profile* profile =
|
| + Profile::FromBrowserContext(web_ui_->tab_contents()->browser_context());
|
| extension_uninstall_dialog_.reset(
|
| - new ExtensionUninstallDialog(web_ui_->GetProfile()));
|
| + new ExtensionUninstallDialog(profile));
|
| }
|
| return extension_uninstall_dialog_.get();
|
| }
|
|
|
| void ExtensionsDOMHandler::HandleToggleDeveloperMode(const ListValue* args) {
|
| - bool developer_mode = web_ui_->GetProfile()->GetPrefs()
|
| - ->GetBoolean(prefs::kExtensionsUIDeveloperMode);
|
| - web_ui_->GetProfile()->GetPrefs()->SetBoolean(
|
| - prefs::kExtensionsUIDeveloperMode, !developer_mode);
|
| + Profile* profile =
|
| + Profile::FromBrowserContext(web_ui_->tab_contents()->browser_context());
|
| + bool developer_mode =
|
| + profile->GetPrefs()->GetBoolean(prefs::kExtensionsUIDeveloperMode);
|
| + profile->GetPrefs()->SetBoolean(prefs::kExtensionsUIDeveloperMode,
|
| + !developer_mode);
|
| }
|
|
|
| void ExtensionsDOMHandler::HandleInspectMessage(const ListValue* args) {
|
| @@ -337,8 +343,9 @@ void ExtensionsDOMHandler::HandleEnableMessage(const ListValue* args) {
|
| if (enable_str == "true") {
|
| ExtensionPrefs* prefs = extension_service_->extension_prefs();
|
| if (prefs->DidExtensionEscalatePermissions(extension_id)) {
|
| - ShowExtensionDisabledDialog(extension_service_,
|
| - web_ui_->GetProfile(), extension);
|
| + Profile* profile = Profile::FromBrowserContext(
|
| + web_ui_->tab_contents()->browser_context());
|
| + ShowExtensionDisabledDialog(extension_service_, profile, extension);
|
| } else {
|
| extension_service_->EnableExtension(extension_id);
|
| }
|
| @@ -450,8 +457,9 @@ void ExtensionsDOMHandler::HandleOptionsMessage(const ListValue* args) {
|
| const Extension* extension = GetExtension(args);
|
| if (!extension || extension->options_url().is_empty())
|
| return;
|
| - web_ui_->GetProfile()->GetExtensionProcessManager()->OpenOptionsPage(
|
| - extension, NULL);
|
| + Profile* profile =
|
| + Profile::FromBrowserContext(web_ui_->tab_contents()->browser_context());
|
| + profile->GetExtensionProcessManager()->OpenOptionsPage(extension, NULL);
|
| }
|
|
|
| void ExtensionsDOMHandler::HandleShowButtonMessage(const ListValue* args) {
|
|
|