Decouple Chrome related code from app code
Updated TODO