| Index: chrome/browser/devtools/devtools_targets_ui.cc
|
| diff --git a/chrome/browser/devtools/devtools_targets_ui.cc b/chrome/browser/devtools/devtools_targets_ui.cc
|
| index 6dc03f6e6f06636736a231f528ae6c2e2b75a3bb..d608c5caa1d7e29fd744f6697e2d743786886514 100644
|
| --- a/chrome/browser/devtools/devtools_targets_ui.cc
|
| +++ b/chrome/browser/devtools/devtools_targets_ui.cc
|
| @@ -66,10 +66,10 @@ std::string SerializeBrowserId(
|
| scoped_refptr<DevToolsAndroidBridge::RemoteBrowser> browser) {
|
| return base::StringPrintf(
|
| "browser:%s:%s:%s:%s",
|
| - browser->serial().c_str(), // Ensure uniqueness across devices.
|
| + browser->serial().c_str(), // Ensure uniqueness across devices.
|
| browser->display_name().c_str(), // Sort by display name.
|
| - browser->version().c_str(), // Then by version.
|
| - browser->socket().c_str()); // Ensure uniqueness on the device.
|
| + browser->version().c_str(), // Then by version.
|
| + browser->socket().c_str()); // Ensure uniqueness on the device.
|
| }
|
|
|
| // CancelableTimer ------------------------------------------------------------
|
| @@ -171,11 +171,11 @@ class LocalTargetsUIHandler
|
| // DevToolsTargetsUIHandler overrides.
|
| void ForceUpdate() override;
|
|
|
| -private:
|
| + private:
|
| // content::NotificationObserver overrides.
|
| - void Observe(int type,
|
| - const content::NotificationSource& source,
|
| - const content::NotificationDetails& details) override;
|
| + void Observe(int type,
|
| + const content::NotificationSource& source,
|
| + const content::NotificationDetails& details) override;
|
|
|
| void ScheduleUpdate();
|
| void UpdateTargets();
|
| @@ -419,7 +419,7 @@ void AdbTargetsUIHandler::DeviceListChanged(
|
| SendSerializedTargets(device_list);
|
| }
|
|
|
| -} // namespace
|
| +} // namespace
|
|
|
| // DevToolsTargetsUIHandler ---------------------------------------------------
|
|
|
| @@ -491,6 +491,7 @@ void DevToolsTargetsUIHandler::SendSerializedTargets(
|
| void DevToolsTargetsUIHandler::ForceUpdate() {
|
| }
|
|
|
| +#if !defined(OS_ANDROID) && !defined(OS_IOS)
|
| // PortForwardingStatusSerializer ---------------------------------------------
|
|
|
| PortForwardingStatusSerializer::PortForwardingStatusSerializer(
|
| @@ -535,3 +536,4 @@ void PortForwardingStatusSerializer::PortStatusChanged(
|
| }
|
| callback_.Run(result);
|
| }
|
| +#endif // !defined(OS_ANDROID) && !defined(OS_IOS)
|
|
|