My anecdotal usage is a combination of these two. Until I saw your provided definition I would have described chip on my shoulder to mean a sense of superiority that leads to me be rude or difficult to interact with.