diff options
| author | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-02 19:14:45 +0000 |
|---|---|---|
| committer | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-02 19:14:45 +0000 |
| commit | 1ed5cd0117990de7a4bd439d8295263b275725b8 (patch) | |
| tree | 55559a4a465b5fcc21c8c068583949458796612f /chrome/browser/dom_ui | |
| parent | 70daf0b18defd88e97f5f9ebcc9486c22898b66b (diff) | |
| download | chromium_src-1ed5cd0117990de7a4bd439d8295263b275725b8.zip chromium_src-1ed5cd0117990de7a4bd439d8295263b275725b8.tar.gz chromium_src-1ed5cd0117990de7a4bd439d8295263b275725b8.tar.bz2 | |
Further tweaks to incognito extensions.
- Add a warning to the incognito new tab page that your extensions are
disabled in that mode.
- Toggling an extension in incognito will reload the extension, fixing a bug
where browser actions in existing incognito windows would not get updated.
BUG=36292
BUG=32365
TEST=run chrome with --enable-experimental-extension-apis and some extensions loaded, and open an incognito window. Enable some extensions in incognito and make sure things work.
Review URL: http://codereview.chromium.org/660220
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40403 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/dom_ui')
| -rw-r--r-- | chrome/browser/dom_ui/ntp_resource_cache.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/chrome/browser/dom_ui/ntp_resource_cache.cc b/chrome/browser/dom_ui/ntp_resource_cache.cc index 85b8e18..63db41c 100644 --- a/chrome/browser/dom_ui/ntp_resource_cache.cc +++ b/chrome/browser/dom_ui/ntp_resource_cache.cc @@ -217,6 +217,14 @@ void NTPResourceCache::CreateNewTabIncognitoHTML() { localized_strings.SetString(L"content", l10n_util::GetStringF(IDS_NEW_TAB_OTR_MESSAGE, GetUrlWithLang(kLearnMoreIncognitoUrl))); + localized_strings.SetString(L"extensionsmessage", + l10n_util::GetStringF(IDS_NEW_TAB_OTR_EXTENSIONS_MESSAGE, + ASCIIToWide(chrome::kChromeUIExtensionsURL))); + bool show_extensions_disabled = + CommandLine::ForCurrentProcess()->HasSwitch( + switches::kEnableExperimentalExtensionApis); + localized_strings.SetString(L"showextensionsmessage", + show_extensions_disabled ? "true" : "false"); bool bookmark_bar_attached = profile_->GetPrefs()->GetBoolean( prefs::kShowBookmarkBar); localized_strings.SetString(L"bookmarkbarattached", |