Update to new stable branch 1750

This also includes an updated ninja and chromium dependencies
needed on Windows.

Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>

1 files changed, 63 insertions, 0 deletions

diff --git a/chromium/chrome/browser/resources/chromeos/browser_options.js b/chromium/chrome/browser/resources/chromeos/browser_options.js
new file mode 100644
index 00000000000..de2b8f7abbf
--- /dev/null
+++ b/chromium/chrome/browser/resources/chromeos/browser_options.js
@@ -0,0 +1,63 @@
+// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+cr.define('options', function() {
+  /** @const */ var OptionsPage = options.OptionsPage;
+
+  /**
+   * Encapsulated handling of the BrowserOptions calls from
+   * BluetoothOptionsHandler that is registered by the webUI,
+   * ie, BluetoothPairingUI.
+   * @constructor
+   */
+  function BrowserOptions() {
+    OptionsPage.call(this,
+                     'bluetooth',
+                     '',
+                     'bluetooth-container');
+  }
+
+  cr.addSingletonGetter(BrowserOptions);
+
+  BrowserOptions.prototype = {
+    __proto__: OptionsPage.prototype,
+
+    /** @override */
+    initializePage: function() {
+      OptionsPage.prototype.initializePage.call(this);
+    },
+  };
+
+  BrowserOptions.showBluetoothSettings = function() {
+  };
+
+  BrowserOptions.setBluetoothState = function() {
+  };
+
+  /**
+   * Handles addBluetoothDevice call, display the Bluetooth pairing overlay
+   * for the pairing device.
+   * @param {{name: string,
+   *          address: string,
+   *          paired: boolean,
+   *          pairing: string | undefined
+   *          pincode: string | undefined
+   *          passkey: number | undefined
+   *          connected: boolean}} device
+   */
+  BrowserOptions.addBluetoothDevice = function(device) {
+    // One device can be in the process of pairing.  If found, display
+    // the Bluetooth pairing overlay.
+    if (device.pairing)
+      BluetoothPairing.showDialog(device);
+  };
+
+  BrowserOptions.removeBluetoothDevice = function(address) {
+  };
+
+  // Export
+  return {
+    BrowserOptions: BrowserOptions
+  };
+});