Links in PDF should open in a new window when shift + left clicked.

chrome/test/data/pdf/navigator_test.js

Index: chrome/test/data/pdf/navigator_test.js
diff --git a/chrome/test/data/pdf/navigator_test.js b/chrome/test/data/pdf/navigator_test.js
index eb53a363ecdb793e273e3855ef8e45318fa17500..096d40dbed10c900be387f523eb0129ea9b16e60 100644
--- a/chrome/test/data/pdf/navigator_test.js
+++ b/chrome/test/data/pdf/navigator_test.js
@@ -28,6 +28,19 @@ function NavigateInNewTabCallback() {
   };
 }
 
+function NavigateInNewWindowCallback() {
+  this.navigateCalled = false;
+  this.url = undefined;
+  this.callback = function(url) {
+    this.navigateCalled = true;
+    this.url = url;
+  }.bind(this);
+  this.reset = function() {
+    this.navigateCalled = false;
+    this.url = undefined;
+  };
+}

[raymes, 2016/09/05 04:29:32]

I'm not sure if it's useful to define this 3 times, perhaps we can just have
one?

[jaepark, 2016/09/06 02:49:56]

Done.

+
 /**
  * Given a |navigator|, navigate to |url| in the current tab or new tab,
  * depending on the value of |openInNewTab|. Use |viewportChangedCallback|
@@ -53,19 +66,23 @@ function doNavigationUrlTest(
  * Helper function to run doNavigationUrlTest() for the current tab and a new
  * tab.
  */
-function doNavigationUrlTestInCurrentTabAndNewTab(
+function doNavigationUrlTestInCurrentTabAndNewTabAndNewWindow(

[raymes, 2016/09/05 04:29:32]

Perhaps just change this to doNavigationUrlTest?

Also the tests that call this don't seem to use the callbacks that get passed
in, so perhaps we can just create them in here?

[jaepark, 2016/09/06 02:49:57]

Done.

     navigator,
     url,
     expectedResultUrl,
     viewportChangedCallback,
     navigateInCurrentTabCallback,
-    navigateInNewTabCallback) {
+    navigateInNewTabCallback,
+    navigateInNewWindowCallback) {
   doNavigationUrlTest(navigator, url,
       Navigator.WindowOpenDisposition.CURRENT_TAB, expectedResultUrl,
       viewportChangedCallback, navigateInCurrentTabCallback);
   doNavigationUrlTest(navigator, url,
       Navigator.WindowOpenDisposition.NEW_BACKGROUND_TAB, expectedResultUrl,
       viewportChangedCallback, navigateInNewTabCallback);
+  doNavigationUrlTest(navigator, url,
+      Navigator.WindowOpenDisposition.NEW_WINDOW, expectedResultUrl,
+      viewportChangedCallback, navigateInNewWindowCallback);
 }
 
 var tests = [
@@ -92,9 +109,11 @@ var tests = [
 
     var navigateInCurrentTabCallback = new NavigateInCurrentTabCallback();
     var navigateInNewTabCallback = new NavigateInNewTabCallback();
+    var navigateInNewWindowCallback = new NavigateInNewWindowCallback();
     var navigator = new Navigator(url, viewport, paramsParser,
         navigateInCurrentTabCallback.callback,
-        navigateInNewTabCallback.callback);
+        navigateInNewTabCallback.callback,
+        navigateInNewWindowCallback.callback);
 
     var documentDimensions = new MockDocumentDimensions();
     documentDimensions.addPage(100, 100);
@@ -164,101 +183,114 @@ var tests = [
 
     var navigateInCurrentTabCallback = new NavigateInCurrentTabCallback();
     var navigateInNewTabCallback = new NavigateInNewTabCallback();
+    var navigateInNewWindowCallback = new NavigateInNewWindowCallback();
     var navigator = new Navigator(url, viewport, paramsParser,
         navigateInCurrentTabCallback.callback,
-        navigateInNewTabCallback.callback);
+        navigateInNewTabCallback.callback,
+        navigateInNewWindowCallback.callback);
 
     // Sanity check.
-    doNavigationUrlTestInCurrentTabAndNewTab(
+    doNavigationUrlTestInCurrentTabAndNewTabAndNewWindow(
         navigator,
         'https://www.foo.com/bar.pdf',
         'https://www.foo.com/bar.pdf',
         mockCallback,
         navigateInCurrentTabCallback,
-        navigateInNewTabCallback);
+        navigateInNewTabCallback,
+        navigateInNewWindowCallback);
 
     // Open relative links.
-    doNavigationUrlTestInCurrentTabAndNewTab(
+    doNavigationUrlTestInCurrentTabAndNewTabAndNewWindow(
         navigator,
         'foo/bar.pdf',
         'http://www.example.com/subdir/foo/bar.pdf',
         mockCallback,
         navigateInCurrentTabCallback,
-        navigateInNewTabCallback);
-    doNavigationUrlTestInCurrentTabAndNewTab(
+        navigateInNewTabCallback,
+        navigateInNewWindowCallback);
+    doNavigationUrlTestInCurrentTabAndNewTabAndNewWindow(
         navigator,
         'foo.com/bar.pdf',
         'http://www.example.com/subdir/foo.com/bar.pdf',
         mockCallback,
         navigateInCurrentTabCallback,
-        navigateInNewTabCallback);
+        navigateInNewTabCallback,
+        navigateInNewWindowCallback);
     // The expected result is not normalized here.
-    doNavigationUrlTestInCurrentTabAndNewTab(
+    doNavigationUrlTestInCurrentTabAndNewTabAndNewWindow(
         navigator,
         '../www.foo.com/bar.pdf',
         'http://www.example.com/subdir/../www.foo.com/bar.pdf',
         mockCallback,
         navigateInCurrentTabCallback,
-        navigateInNewTabCallback);
+        navigateInNewTabCallback,
+        navigateInNewWindowCallback);
 
     // Open an absolute link.
-    doNavigationUrlTestInCurrentTabAndNewTab(
+    doNavigationUrlTestInCurrentTabAndNewTabAndNewWindow(
         navigator,
         '/foodotcom/bar.pdf',
         'http://www.example.com/foodotcom/bar.pdf',
         mockCallback,
         navigateInCurrentTabCallback,
-        navigateInNewTabCallback);
+        navigateInNewTabCallback,
+        navigateInNewWindowCallback);
 
     // Open a http url without a scheme.
-    doNavigationUrlTestInCurrentTabAndNewTab(
+    doNavigationUrlTestInCurrentTabAndNewTabAndNewWindow(
         navigator,
         'www.foo.com/bar.pdf',
         'http://www.foo.com/bar.pdf',
         mockCallback,
         navigateInCurrentTabCallback,
-        navigateInNewTabCallback);
+        navigateInNewTabCallback,
+        navigateInNewWindowCallback);
 
     // Test three dots.
-    doNavigationUrlTestInCurrentTabAndNewTab(
+    doNavigationUrlTestInCurrentTabAndNewTabAndNewWindow(
         navigator,
         '.../bar.pdf',
         'http://www.example.com/subdir/.../bar.pdf',
         mockCallback,
         navigateInCurrentTabCallback,
-        navigateInNewTabCallback);
+        navigateInNewTabCallback,
+        navigateInNewWindowCallback);
 
     // Test forward slashes.
-    doNavigationUrlTestInCurrentTabAndNewTab(
+    doNavigationUrlTestInCurrentTabAndNewTabAndNewWindow(
         navigator,
         '..\\bar.pdf',
         'http://www.example.com/subdir/..\\bar.pdf',
         mockCallback,
         navigateInCurrentTabCallback,
-        navigateInNewTabCallback);
-    doNavigationUrlTestInCurrentTabAndNewTab(
+        navigateInNewTabCallback,
+        navigateInNewWindowCallback);
+    doNavigationUrlTestInCurrentTabAndNewTabAndNewWindow(
         navigator,
         '.\\bar.pdf',
         'http://www.example.com/subdir/.\\bar.pdf',
         mockCallback,
         navigateInCurrentTabCallback,
-        navigateInNewTabCallback);
-    doNavigationUrlTestInCurrentTabAndNewTab(
+        navigateInNewTabCallback,
+        navigateInNewWindowCallback);
+    doNavigationUrlTestInCurrentTabAndNewTabAndNewWindow(
         navigator,
         '\\bar.pdf',
         'http://www.example.com/subdir/\\bar.pdf',
         mockCallback,
         navigateInCurrentTabCallback,
-        navigateInNewTabCallback);
+        navigateInNewTabCallback,
+        navigateInNewWindowCallback);
 
     // Regression test for https://crbug.com/569040
-    doNavigationUrlTestInCurrentTabAndNewTab(
+    doNavigationUrlTestInCurrentTabAndNewTabAndNewWindow(
         navigator,
         'http://something.else/foo#page=5',
         'http://something.else/foo#page=5',
         mockCallback,
         navigateInCurrentTabCallback,
-        navigateInNewTabCallback);
+        navigateInNewTabCallback,
+        navigateInNewWindowCallback);
 
     chrome.test.succeed();
   },
@@ -280,18 +312,21 @@ var tests = [
 
     var navigateInCurrentTabCallback = new NavigateInCurrentTabCallback();
     var navigateInNewTabCallback = new NavigateInNewTabCallback();
+    var navigateInNewWindowCallback = new NavigateInNewWindowCallback();
     var navigator = new Navigator(url, viewport, paramsParser,
         navigateInCurrentTabCallback.callback,
-        navigateInNewTabCallback.callback);
+        navigateInNewTabCallback.callback,
+        navigateInNewWindowCallback.callback);
 
     // Open an absolute link.
-    doNavigationUrlTestInCurrentTabAndNewTab(
+    doNavigationUrlTestInCurrentTabAndNewTabAndNewWindow(
         navigator,
         '/foodotcom/bar.pdf',
         'file:///foodotcom/bar.pdf',
         mockCallback,
         navigateInCurrentTabCallback,
-        navigateInNewTabCallback);
+        navigateInNewTabCallback,
+        navigateInNewWindowCallback);
 
     chrome.test.succeed();
   }