Guess you will cross the city of Calabasas off your list too Eric, they have banned smoking in the whole city,outside,as of a few days ago...
but I don't think you have to worry that Oceania will go completely non smoking...the owners like their Cuban cigars too much for that..