merge and added a make file for chromium.