Browser: Change to switches

Change-Id: I1b41d6ab138db031aa718f6121156ef21ebfd41c