Perspective Crop tool
The Perspective Crop tool can be used to crop and correct the converging verticals or horizontal lines in a picture with a single crop action. Using the Perspective Crop tool I was able to accurately reposition the corner handles on the image to match the perspective of the building. To do this you can either marquee drag with the tool as usual, or click to define the four corners of the perspective crop, after which you can drag on the corner and/or side handles to adjust the crop shape. Having done this you can click to confirm and apply the crop and, at the same time, correct the perspective. The Perspective crop should work well in most cases, but you may sometimes need to apply a further Transform adjustment to compensate for any undesired stretching of the image.