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/resources | |
| 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/resources')
| -rw-r--r-- | chrome/browser/resources/incognito_tab.html | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/chrome/browser/resources/incognito_tab.html b/chrome/browser/resources/incognito_tab.html index fac60e1..e0c8933 100644 --- a/chrome/browser/resources/incognito_tab.html +++ b/chrome/browser/resources/incognito_tab.html @@ -1,5 +1,5 @@ <!DOCTYPE html> -<html i18n-values="dir:textdirection;bookmarkbarattached:bookmarkbarattached"> +<html i18n-values="dir:textdirection;bookmarkbarattached:bookmarkbarattached;showextensionsmessage:showextensionsmessage"> <head> <title i18n-content="title"></title> <style> @@ -25,6 +25,22 @@ html[dir="rtl"] .icon { margin-right:auto; margin-top:66px; } +html[showextensionsmessage="true"] .extensionsmessage { + color:black; + padding:10px 10px 10px 10px; + max-width:600px; + margin-left:auto; + margin-right:auto; + margin-top:5px; +} +html[showextensionsmessage="false"] .extensionsmessage { + display:none; +} +.extensionicon { + float:left; + margin:10px 5px 0 0px; + width:30px; +} </style> <script> // Until themes can clear the cache, force-reload the theme stylesheet. @@ -38,6 +54,10 @@ document.write('<link id="incognitothemecss" rel="stylesheet" ' + <img src="../../app/theme/otr_icon_standalone.png" class="icon" /> <span i18n-values=".innerHTML:content"></span> </div> +<div class="extensionsmessage" i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize"> + <img src="../../app/theme/extensions_section.png" class="extensionicon" /> + <span i18n-values=".innerHTML:extensionsmessage"></span> +</div> </body> <script> function themeChanged() { |