Index: chrome/browser/resources/pdf/pdf.js |
diff --git a/chrome/browser/resources/pdf/pdf.js b/chrome/browser/resources/pdf/pdf.js |
index 6f8e0318d412d53b6646945aeaaa5c609f192466..14b643912c77e7091c031b1f2567a83e110f0272 100644 |
--- a/chrome/browser/resources/pdf/pdf.js |
+++ b/chrome/browser/resources/pdf/pdf.js |
@@ -149,8 +149,6 @@ function PDFViewer(browserApi) { |
window.addEventListener('message', this.handleScriptingMessage.bind(this), |
false); |
- document.title = decodeURIComponent( |
- getFilenameFromURL(this.browserApi_.getStreamInfo().originalUrl)); |
this.plugin_.setAttribute('src', |
this.browserApi_.getStreamInfo().originalUrl); |
this.plugin_.setAttribute('stream-url', |
@@ -198,7 +196,6 @@ function PDFViewer(browserApi) { |
this.viewport_.zoomOut.bind(this.viewport_)); |
this.materialToolbar_ = $('material-toolbar'); |
- this.materialToolbar_.docTitle = document.title; |
this.materialToolbar_.addEventListener('save', this.save_.bind(this)); |
this.materialToolbar_.addEventListener('print', this.print_.bind(this)); |
this.materialToolbar_.addEventListener('rotate-right', |
@@ -607,10 +604,19 @@ PDFViewer.prototype = { |
case 'cancelStreamUrl': |
chrome.mimeHandlerPrivate.abortStream(); |
break; |
- case 'bookmarks': |
+ case 'metadata': |
+ if (message.data.title) { |
+ document.title = message.data.title; |
+ } else { |
+ document.title = decodeURIComponent( |
+ getFilenameFromURL(this.browserApi_.getStreamInfo().originalUrl)); |
+ } |
this.bookmarks_ = message.data.bookmarks; |
- if (this.isMaterial_ && this.bookmarks_.length !== 0) |
- this.materialToolbar_.bookmarks = this.bookmarks; |
+ if (this.isMaterial_) { |
+ this.materialToolbar_.docTitle = document.title; |
+ if (this.bookmarks_.length !== 0) |
raymes
2015/08/27 04:07:37
I wonder if we can remove this check safely?
Sam McNally
2015/08/27 04:18:48
I wondered the same thing. Unfortunately, without
Sam McNally
2015/08/27 04:43:31
Done.
|
+ this.materialToolbar_.bookmarks = this.bookmarks; |
+ } |
break; |
case 'setIsSelecting': |
this.viewportScroller_.setEnableScrolling(message.data.isSelecting); |