Commit af6cc997 authored by Matt Swartwout's avatar Matt Swartwout Committed by Commit Bot

Remove shadow variable names from dbus/

This was causing some -Wshadow compiler errors in Chromecast builds.

Change-Id: I2ebdd629e3472302db5d4d05e340c89223d690eb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2197490Reviewed-by: default avatarRyo Hashimoto <hashimoto@chromium.org>
Commit-Queue: Matt Swartwout <mwswartwout@google.com>
Auto-Submit: Matt Swartwout <mwswartwout@google.com>
Cr-Commit-Position: refs/heads/master@{#769032}
parent 16ca64a0
...@@ -561,7 +561,6 @@ DBusHandlerResult ObjectProxy::HandleMessage(DBusConnection* connection, ...@@ -561,7 +561,6 @@ DBusHandlerResult ObjectProxy::HandleMessage(DBusConnection* connection,
FROM_HERE, base::BindOnce(&ObjectProxy::RunMethod, this, start_time, FROM_HERE, base::BindOnce(&ObjectProxy::RunMethod, this, start_time,
iter->second, released_signal)); iter->second, released_signal));
} else { } else {
const base::TimeTicks start_time = base::TimeTicks::Now();
// If the D-Bus thread is not used, just call the callback on the // If the D-Bus thread is not used, just call the callback on the
// current thread. Transfer the ownership of |signal| to RunMethod(). // current thread. Transfer the ownership of |signal| to RunMethod().
Signal* released_signal = signal.release(); Signal* released_signal = signal.release();
......
...@@ -281,8 +281,8 @@ void AppendValueData(MessageWriter* writer, const base::Value& value) { ...@@ -281,8 +281,8 @@ void AppendValueData(MessageWriter* writer, const base::Value& value) {
value.GetAsList(&list); value.GetAsList(&list);
dbus::MessageWriter array_writer(nullptr); dbus::MessageWriter array_writer(nullptr);
writer->OpenArray("v", &array_writer); writer->OpenArray("v", &array_writer);
for (const auto& value : *list) { for (const auto& value_in_list : *list) {
AppendValueDataAsVariant(&array_writer, value); AppendValueDataAsVariant(&array_writer, value_in_list);
} }
writer->CloseContainer(&array_writer); writer->CloseContainer(&array_writer);
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment