diff options
author | jamesr <jamesr@chromium.org> | 2014-11-03 17:46:10 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-11-04 01:46:31 +0000 |
commit | 0f18be91be7c4aa9e55ad020fa5a2408f389a9d1 (patch) | |
tree | 884ce770b6c27bf696e15ece17cfa61c0ba5da19 /device/battery | |
parent | 174ab92a101d02bce1301d8fdc8ec15ec5557137 (diff) | |
download | chromium_src-0f18be91be7c4aa9e55ad020fa5a2408f389a9d1.zip chromium_src-0f18be91be7c4aa9e55ad020fa5a2408f389a9d1.tar.gz chromium_src-0f18be91be7c4aa9e55ad020fa5a2408f389a9d1.tar.bz2 |
Update mojo sdk to rev cfc99316100efdfa7d53d83f9e07f1d4d3765c21
Most changes are updates to the mojom syntax for modules.
R=viettrungluu@chromium.org
TBR=jam@chromium.org
Review URL: https://codereview.chromium.org/698883005
Cr-Commit-Position: refs/heads/master@{#302542}
Diffstat (limited to 'device/battery')
-rw-r--r-- | device/battery/battery_monitor.mojom | 6 | ||||
-rw-r--r-- | device/battery/battery_status.mojom | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/device/battery/battery_monitor.mojom b/device/battery/battery_monitor.mojom index fa29591..880685e 100644 --- a/device/battery/battery_monitor.mojom +++ b/device/battery/battery_monitor.mojom @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import "device/battery/battery_status.mojom"; +module device; -module device { +import "device/battery/battery_status.mojom"; // A BatteryMonitor will periodically call its client's DidChange method. [Client=BatteryStatusObserver] @@ -14,5 +14,3 @@ interface BatteryMonitor { interface BatteryStatusObserver { DidChange(BatteryStatus status); }; - -} diff --git a/device/battery/battery_status.mojom b/device/battery/battery_status.mojom index 6e9ba46..f89808c 100644 --- a/device/battery/battery_status.mojom +++ b/device/battery/battery_status.mojom @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -module device { +module device; struct BatteryStatus { bool charging = true; @@ -10,5 +10,3 @@ struct BatteryStatus { double discharging_time = double.INFINITY; double level = 1.0; }; - -} |