summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordpapad@chromium.org <dpapad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-03 20:00:18 +0000
committerdpapad@chromium.org <dpapad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-03 20:00:18 +0000
commit1c92c068ce30469363cd01181cd8e5c901daa8a4 (patch)
treeeb9979615b8ce9354652d2181b35a2d6ec124606
parent6c4f2118384e49177cfd0b923902351fa0412a9b (diff)
downloadchromium_src-1c92c068ce30469363cd01181cd8e5c901daa8a4.zip
chromium_src-1c92c068ce30469363cd01181cd8e5c901daa8a4.tar.gz
chromium_src-1c92c068ce30469363cd01181cd8e5c901daa8a4.tar.bz2
Merge 115899 - Print Preview: Fixing displaying error messages with HTML content.
BUG=108139 TEST=See bug description. Review URL: http://codereview.chromium.org/9041010 TBR=dpapad@chromium.org Review URL: http://codereview.chromium.org/9015034 git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@116181 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/resources/print_preview/preview_area.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/resources/print_preview/preview_area.js b/chrome/browser/resources/print_preview/preview_area.js
index 23388d9..08bd567 100644
--- a/chrome/browser/resources/print_preview/preview_area.js
+++ b/chrome/browser/resources/print_preview/preview_area.js
@@ -212,7 +212,7 @@ cr.define('print_preview', function() {
*/
displayErrorMessageAndNotify: function(errorMessage) {
this.overlayLayer.classList.remove('invisible');
- this.customMessage_.textContent = errorMessage;
+ this.customMessage_.innerHTML = errorMessage;
this.customMessage_.hidden = false;
this.customMessageWithDots_.innerHTML = '';
this.customMessageWithDots_.hidden = true;