Index: chrome/browser/resources/pdf/navigator.js |
diff --git a/chrome/browser/resources/pdf/navigator.js b/chrome/browser/resources/pdf/navigator.js |
index 611b4a91bde90a5496d1614ac4e14ec7098e55f9..0d3bc2fd113daac987f6e8e4e47bf071ae56081b 100644 |
--- a/chrome/browser/resources/pdf/navigator.js |
+++ b/chrome/browser/resources/pdf/navigator.js |
@@ -9,21 +9,17 @@ |
* @param {string} originalUrl The original page URL. |
* @param {Object} viewport The viewport info of the page. |
* @param {Object} paramsParser The object for URL parsing. |
- * @param {Function} navigateInCurrentTabCallback The Callback function that |
- * gets called when navigation happens in the current tab. |
- * @param {Function} navigateInNewTabCallback The Callback function |
- * that gets called when navigation happens in the new tab. |
+ * @param {Object} navigateCallback The object with callback functions that |
+ * get called when navigation happens in the current tab, a new tab, |
+ * and a new window. |
*/ |
-function Navigator(originalUrl, |
- viewport, |
- paramsParser, |
- navigateInCurrentTabCallback, |
- navigateInNewTabCallback) { |
+function Navigator(originalUrl, viewport, paramsParser, navigateCallback) { |
raymes
2016/09/06 04:36:07
I think it would be better to call it something li
jaepark
2016/09/06 20:32:46
Done.
|
this.originalUrl_ = originalUrl; |
this.viewport_ = viewport; |
this.paramsParser_ = paramsParser; |
- this.navigateInCurrentTabCallback_ = navigateInCurrentTabCallback; |
- this.navigateInNewTabCallback_ = navigateInNewTabCallback; |
+ this.navigateInCurrentTabCallback_ = navigateCallback.currentTabCallback; |
raymes
2016/09/06 04:36:07
this.navigatorDelegate_ = navigatorDelegate;
jaepark
2016/09/06 20:32:47
Done.
|
+ this.navigateInNewTabCallback_ = navigateCallback.newTabCallback; |
+ this.navigateInNewWindowCallback_ = navigateCallback.newWindowCallback; |
} |
/** |
@@ -84,10 +80,7 @@ Navigator.prototype = { |
this.navigateInNewTabCallback_(url, true); |
raymes
2016/09/06 04:36:07
this.navigatorDelegate_.navigateInNewTab(...);
jaepark
2016/09/06 20:32:47
Done.
|
break; |
case Navigator.WindowOpenDisposition.NEW_WINDOW: |
- // TODO(jaepark): Shift + left clicking a link in PDF should open the |
- // link in a new window. See http://crbug.com/628057. |
- this.paramsParser_.getViewportFromUrlParams( |
- url, this.onViewportReceived_.bind(this)); |
+ this.navigateInNewWindowCallback_(url); |
raymes
2016/09/06 04:36:07
this.navigatorDelegate_.navigateInNewWindow(...);
jaepark
2016/09/06 20:32:47
Done.
|
break; |
case Navigator.WindowOpenDisposition.SAVE_TO_DISK: |
// TODO(jaepark): Alt + left clicking a link in PDF should |