Johnson, a Democrat from Texas , served as a United States Representative from 1937–1949 and as a Senator from 1949–1961, including six years as United States Senate Majority Leader , two as Senate Minority Leader and two as Senate Majority Whip .