diff options
| author | arv@chromium.org <arv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-10 19:54:41 +0000 |
|---|---|---|
| committer | arv@chromium.org <arv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-10 19:54:41 +0000 |
| commit | cb0ce1e02b7d16ab9024da9335ab7c70c493aa4e (patch) | |
| tree | 1665a8f8d944aa85938154cbf2fefa5797c226aa /chrome/browser/extensions/extensions_ui.cc | |
| parent | 17496bbed312152a6a0c2251c88ccefd70849540 (diff) | |
| download | chromium_src-cb0ce1e02b7d16ab9024da9335ab7c70c493aa4e.zip chromium_src-cb0ce1e02b7d16ab9024da9335ab7c70c493aa4e.tar.gz chromium_src-cb0ce1e02b7d16ab9024da9335ab7c70c493aa4e.tar.bz2 | |
Bookmark manager: Open in incognito window.
Make IsIncognitoEnabled take an Extension* as an argument as well and use that where possible.
BUG=4890
TEST=Select one more bookmarks and right click/tools and select "Open in incognito". The bookmarks should open in an incognito window.
Review URL: http://codereview.chromium.org/750001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41193 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extensions_ui.cc')
| -rw-r--r-- | chrome/browser/extensions/extensions_ui.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/chrome/browser/extensions/extensions_ui.cc b/chrome/browser/extensions/extensions_ui.cc index 6f23280..00b658e 100644 --- a/chrome/browser/extensions/extensions_ui.cc +++ b/chrome/browser/extensions/extensions_ui.cc @@ -446,8 +446,10 @@ void ExtensionsDOMHandler::HandleEnableIncognitoMessage(const Value* value) { std::string extension_id, enable_str; CHECK(list->GetString(0, &extension_id)); CHECK(list->GetString(1, &enable_str)); - extensions_service_->SetIsIncognitoEnabled(extension_id, - (enable_str == "true")); + Extension* extension = extensions_service_->GetExtensionById(extension_id, + true); + DCHECK(extension); + extensions_service_->SetIsIncognitoEnabled(extension, (enable_str == "true")); } void ExtensionsDOMHandler::HandleUninstallMessage(const Value* value) { @@ -715,7 +717,7 @@ DictionaryValue* ExtensionsDOMHandler::CreateExtensionDetailValue( extension_data->SetString(L"version", extension->version()->GetString()); extension_data->SetBoolean(L"enabled", enabled); extension_data->SetBoolean(L"enabledIncognito", - service ? service->IsIncognitoEnabled(extension->id()) : false); + service ? service->IsIncognitoEnabled(extension) : false); extension_data->SetBoolean(L"allow_reload", extension->location() == Extension::LOAD); |