Make the dismiss button on the CF infobar be an image button.

chrome_frame/turndown_prompt/turndown_prompt_window.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_FRAME_TURNDOWN_PROMPT_TURNDOWN_PROMPT_WINDOW_H_
 #define CHROME_FRAME_TURNDOWN_PROMPT_TURNDOWN_PROMPT_WINDOW_H_
 
 #include <windows.h>
 #include <atlbase.h>
 #include <atlapp.h>
@@ skipping 10 matching lines @@
 #include "base/win/scoped_comptr.h"
 #include "base/win/scoped_handle.h"
 #include "chrome_frame/infobars/infobar_content.h"
 #include "chrome_frame/resource.h"
 #include "grit/chrome_frame_dialogs.h"
 
 class UrlLauncher;
 
 namespace WTL {
 class CHyperLink;
+class CBitmapButton;
 }  // namespace WTL
 
+class CFBitmapButton;
+
 // Implements a dialog with text and buttons notifying the user that Chrome
 // Frame is being turned down, offering them a link to learn more about moving
 // to a modern browser.
 class TurndownPromptWindow
     : public CDialogImpl<TurndownPromptWindow, CWindow>,
       public CDialogResize<TurndownPromptWindow>,
       public CThemeImpl<TurndownPromptWindow> {
  public:
   enum { IDD = IDD_CHROME_FRAME_TURNDOWN_PROMPT };
 
@@ skipping 18 matching lines @@
     MSG_WM_INITDIALOG(OnInitDialog)
     NOTIFY_HANDLER(IDC_TD_PROMPT_LINK, NM_CLICK, OnLearnMore)
     COMMAND_HANDLER(IDUNINSTALL, BN_CLICKED, OnUninstall)
     COMMAND_HANDLER(IDDISMISS, BN_CLICKED, OnDismiss)
     CHAIN_MSG_MAP(CDialogResize<TurndownPromptWindow>)
   END_MSG_MAP()
 
   BEGIN_DLGRESIZE_MAP(InfobarWindow)
     DLGRESIZE_CONTROL(IDDISMISS, DLSZ_CENTER_Y | DLSZ_MOVE_X)
     DLGRESIZE_CONTROL(IDUNINSTALL, DLSZ_CENTER_Y | DLSZ_MOVE_X)
+    DLGRESIZE_CONTROL(IDC_TD_PROMPT_LINK, DLSZ_CENTER_Y | DLSZ_MOVE_X)

[grt (UTC plus 2), 2013/07/23 01:38:33]

is this the change that fixed the flickering?

[robertshield, 2013/07/23 03:09:57]

No, it was reducing the width so they didn't overlap that did it. This does list
the controls in right to left order which is slightly better than the randomish
order before imo, so I'll leave it unless you erupt in violent boils at the
sight of it.

     DLGRESIZE_CONTROL(IDC_TD_PROMPT_MESSAGE, DLSZ_SIZE_Y | DLSZ_SIZE_X)
-    DLGRESIZE_CONTROL(IDC_TD_PROMPT_LINK, DLSZ_CENTER_Y | DLSZ_MOVE_X)
   END_DLGRESIZE_MAP()
 
   virtual void OnFinalMessage(HWND);
 
  private:
   // Call CreateInstance() to get an initialized TurndownPromptWindow.
   TurndownPromptWindow(InfobarContent::Frame* frame,
                        UrlLauncher* url_launcher,
                        const base::Closure& uninstall_closure);
 
   // The TurndownPromptWindow manages its own destruction.
   virtual ~TurndownPromptWindow();
 
+  // Performs the necessary configuration to initialize a bitmap button.
+  static void SetupBitmapButton(TurndownPromptWindow* window);
+
   // Event handlers.
   void OnDestroy();
   BOOL OnInitDialog(CWindow wndFocus, LPARAM lInitParam);
   LRESULT OnLearnMore(WORD wParam, LPNMHDR lParam, BOOL& bHandled);  // NOLINT
   LRESULT OnUninstall(WORD wNotifyCode,
                       WORD wID,
                       HWND hWndCtl,
                       BOOL& bHandled);
   LRESULT OnDismiss(WORD wNotifyCode,
                     WORD wID,
                     HWND hWndCtl,
                     BOOL& bHandled);
 
   // Returns the prompt text for the current version of IE.
   static string16 GetPromptText();
 
   InfobarContent::Frame* frame_;  // Not owned by this instance
   scoped_ptr<WTL::CHyperLink> link_;
+  scoped_ptr<CFBitmapButton> close_button_;
   scoped_ptr<UrlLauncher> url_launcher_;
   base::Closure uninstall_closure_;
 
   base::WeakPtrFactory<TurndownPromptWindow> weak_ptr_factory_;
   DISALLOW_COPY_AND_ASSIGN(TurndownPromptWindow);
 };  // class TurndownPromptWindow
 
 #endif  // CHROME_FRAME_TURNDOWN_PROMPT_TURNDOWN_PROMPT_WINDOW_H_