I don't think the first will happen, since there are still millions of Macs in the wild (and many models still in production) which will not have the touchbar. Thus, the easiest path will be to simply duplicate on-screen functionality (or expose functionality already hidden behind menus).