1064834 - move second screen modules to toolkit

Status: RESOLVED FIXED

(Toolkit :: General, defect)

Description

[Brad Lassey [:blassey] (use needinfo?)]

Attachment: second_screen_modules.patch

Comment 1

[Mark Finkle (:mfinkle) (use needinfo?)]

Comment on attachment 8486379 [details] [diff] [review]
second_screen_modules.patch

>diff --git a/mobile/android/modules/SimpleServiceDiscovery.jsm b/toolkit/modules/secondscreen/SimpleServiceDiscovery.jsm

> // Define the "log" function as a binding of the Log.d function so it specifies
> // the "debug" priority and a log tag.
>-let log = Cu.import("resource://gre/modules/AndroidLog.jsm", {}).AndroidLog.d.bind(null, "SSDP");
>+let log = Cc["@mozilla.org/consoleservice;1"].getService(Ci.nsIConsoleService).logStringMessage

I wouldn't mind this becoming a #ifdef / #else / #endif so we keep our nicer Android logging. We do the same thing in some WebApps toolkit code too.

>+#ifdef ANDROID
>     // We also query Java directly here for any devices that Android might support natively (i.e. Chromecast or Miracast)
>     this.getAndroidDevices();
>   },
>@@ -194,6 +197,7 @@ var SimpleServiceDiscovery = {
>         this._addService(service);
>       }
>     });
>+#endif
>   },

Would you mind treating these blocks separately? Yes, this compiles fine, but I'd like it to be a little cleaner and readable.

r+ with the nits fixed please.

If possible, I'd like to land this after bug 1020564 and bug 1058384 since those would be heavily bitrotted. Give me a few days to push on the reviews and see if I can't land all of these.

Comment 2

[Brad Lassey [:blassey] (use needinfo?)]

Attachment: second_screen_modules.patch

Updated patch with nits addressed

Comment 3

[Mark Finkle (:mfinkle) (use needinfo?)]

NI'ing myself to land this at the right time

Comment 4

[Mark Finkle (:mfinkle) (use needinfo?)]

https://hg.mozilla.org/integration/fx-team/rev/3ead4703741f

Comment 5

[Mark Finkle (:mfinkle) (use needinfo?)]

Try run looked fine:
https://tbpl.mozilla.org/?tree=Try&rev=463ed4d5d1ae

Comment 6

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/3ead4703741f