Perhaps William D. Leahy will as well.
Right you are. I was unaware about Adm. Leahy's assignments after his tour as CNO.
In January 1937, Admiral Leahy became Chief of Naval Operations, serving for more than two years during a period marked by increasing tensions in the Far East and Europe and by a gradual expansion of the Navy. During this time he frequently had additional duty as Acting Secretary of the Navy. Following retirement in August 1939, Leahy was appointed Governor of Puerto Rico. In late 1940, he became the United States Ambassador to France, serving in that very demanding position until April 1942.
Upon his return home, Admiral Leahy was recalled to Navy service as Aide to President Franklin D. Roosevelt and as Senior Member of the Joint Chiefs of Staff. As such, he played a critical role in the strategy, diplomacy and execution of the Second World War. In recognition of these accomplishments, he received promotion to the rank of Fleet Admiral in December 1944. After Roosevelt's death in April 1945, Leahy continued in his posts, assisting President Harry S. Truman in bringing about final victory against Germany and Japan and then helping to guide the Nation in the early post-war years. Though he retired in 1949, Fleet Admiral Leahy technically remained on active duty until his death on 20 July 1959.
http://www.history.navy.mil/photos/pers-us/uspers-l/wd-leahy.htm