| Index: chrome/browser/resources/uber/uber_frame.js
|
| diff --git a/chrome/browser/resources/uber/uber_frame.js b/chrome/browser/resources/uber/uber_frame.js
|
| index cf3f3a43279272de0ac97dd909985089a95dc4be..fc4ea5dbdd39a3f6c1b63818e46cae4e853ee8b6 100644
|
| --- a/chrome/browser/resources/uber/uber_frame.js
|
| +++ b/chrome/browser/resources/uber/uber_frame.js
|
| @@ -7,8 +7,8 @@
|
| // in an iframe. Iframes can be layered on top of each other, but not mixed in
|
| // with page content, so all overlapping content on uber must be framed.
|
|
|
| -<include src="../../../../ui/webui/resources/js/util.js">
|
| -<include src="uber_utils.js">
|
| +// <include src="../../../../ui/webui/resources/js/util.js">
|
| +// <include src="uber_utils.js">
|
|
|
| cr.define('uber_frame', function() {
|
|
|
| @@ -45,15 +45,15 @@ cr.define('uber_frame', function() {
|
| // Extensions can override Uber content (e.g., if the user has a history
|
| // extension, it should display when the 'History' navigation is clicked).
|
| if (e.currentTarget.getAttribute('override') == 'yes') {
|
| - window.open('chrome://' + e.currentTarget.getAttribute('controls'),
|
| - '_blank');
|
| + window.open(
|
| + 'chrome://' + e.currentTarget.getAttribute('controls'), '_blank');
|
| return;
|
| }
|
|
|
| - uber.invokeMethodOnParent('showPage',
|
| - {pageId: e.currentTarget.getAttribute('controls')});
|
| + uber.invokeMethodOnParent(
|
| + 'showPage', {pageId: e.currentTarget.getAttribute('controls')});
|
|
|
| - setSelection(/** @type {Element} */(e.currentTarget));
|
| + setSelection(/** @type {Element} */ (e.currentTarget));
|
| }
|
|
|
| /**
|
| @@ -138,8 +138,8 @@ cr.define('uber_frame', function() {
|
| * @param {Event} e The mouse wheel event.
|
| */
|
| function onMouseWheel(e) {
|
| - uber.invokeMethodOnParent('mouseWheel',
|
| - {deltaX: e.wheelDeltaX, deltaY: e.wheelDeltaY});
|
| + uber.invokeMethodOnParent(
|
| + 'mouseWheel', {deltaX: e.wheelDeltaX, deltaY: e.wheelDeltaY});
|
| }
|
|
|
| /**
|
| @@ -167,8 +167,7 @@ cr.define('uber_frame', function() {
|
| * that element (either 'yes' or 'no').
|
| */
|
| function setNavigationOverride(controls, override) {
|
| - var navItem =
|
| - document.querySelector('li[controls="' + controls + '"]');
|
| + var navItem = document.querySelector('li[controls="' + controls + '"]');
|
| navItem.setAttribute('override', override);
|
| }
|
|
|
|
|