Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7007)

Unified Diff: chrome/browser/resources/pdf/browser_api.js

Issue 2299943002: Record the PDF and top level URL when the PDF plugin crashes. (Closed)
Patch Set: fix typo Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/pdf/browser_api.js
diff --git a/chrome/browser/resources/pdf/browser_api.js b/chrome/browser/resources/pdf/browser_api.js
index 53f14b5460e770d538a8ff1eacd57811510b8bcd..90033b84085322370cabe103d2970fd738817a56 100644
--- a/chrome/browser/resources/pdf/browser_api.js
+++ b/chrome/browser/resources/pdf/browser_api.js
@@ -152,15 +152,24 @@ function createBrowserApiForMimeHandlerView() {
return new Promise(function(resolve, reject) {
chrome.mimeHandlerPrivate.getStreamInfo(resolve);
}).then(function(streamInfo) {
+ let promises = [];
let manageZoom = !streamInfo.embedded && streamInfo.tabId != -1;
- return new Promise(function(resolve, reject) {
- if (!manageZoom) {
- resolve();
- return;
- }
- chrome.tabs.setZoomSettings(
- streamInfo.tabId, {mode: 'manual', scope: 'per-tab'}, resolve);
- }).then(function() { return BrowserApi.create(streamInfo, manageZoom); });
+ if (streamInfo.tabId != -1) {
+ promises.push(new Promise(function(resolve) {
+ chrome.tabs.get(streamInfo.tabId, resolve);
+ }).then(function(tab) {
+ if (tab)
+ streamInfo.tabUrl = tab.url;
+ }));
+ }
+ if (manageZoom) {
+ promises.push(new Promise(function(resolve) {
+ chrome.tabs.setZoomSettings(
+ streamInfo.tabId, {mode: 'manual', scope: 'per-tab'}, resolve);
+ }));
+ }
+ return Promise.all(promises).then(
+ function() { return BrowserApi.create(streamInfo, manageZoom); });
});
}
@@ -185,6 +194,7 @@ function createBrowserApiForStandaloneExtension() {
}
chrome.tabs.getCurrent(function(tab) {
streamInfo.tabId = tab.id;
+ streamInfo.tabUrl = tab.url;
resolve();
});
}).then(function() { return BrowserApi.create(streamInfo, false); });
« no previous file with comments | « chrome/browser/extensions/api/streams_private/streams_private_api.cc ('k') | chrome/browser/resources/pdf/pdf.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698