Further modifications to the Ready Mode UI in response to feedback. Height, i...

chrome_frame/ready_mode/internal/ready_prompt_window.cc

 // Copyright (c) 2010 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.
 
 #include "chrome_frame/ready_mode/internal/ready_prompt_window.h"
 
 #include <atlctrls.h>
 #include <Shellapi.h>
 
 #include "base/compiler_specific.h"
@@ skipping 10 matching lines @@
 // file.
 #include <minmax.h>  // NOLINT
 #include <atlctrlx.h>  // NOLINT
 
 ReadyPromptWindow::ReadyPromptWindow(
     InfobarContent::Frame* frame, ReadyModeState* ready_mode_state,
     UrlLauncher* url_launcher)
     : frame_(frame),
       ready_mode_state_(ready_mode_state),
       url_launcher_(url_launcher),
+      icon_(NULL),
       weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
 }
 ReadyPromptWindow::~ReadyPromptWindow() {
+  if (icon_)
+    ::DestroyIcon(icon_);
 }
 
 base::WeakPtr<ReadyPromptWindow> ReadyPromptWindow::CreateInstance(
     InfobarContent::Frame* frame, ReadyModeState* ready_mode_state,
     UrlLauncher* url_launcher) {
   DCHECK(frame != NULL);
   DCHECK(ready_mode_state != NULL);
   DCHECK(url_launcher != NULL);
 
   base::WeakPtr<ReadyPromptWindow> instance((new ReadyPromptWindow(
       frame, ready_mode_state, url_launcher))->weak_ptr_factory_.GetWeakPtr());
 
   DCHECK(!instance->IsWindow());
 
   if (instance->Create(frame->GetFrameWindow()) == NULL) {
     DPLOG(ERROR) << "Failed to create HWND for ReadyPromptWindow.";
     return base::WeakPtr<ReadyPromptWindow>();
   }
 
   // Subclass the "Learn more." text to make it behave like a link. Clicks are
   // routed to OnLearnMore().
   CWindow rte = instance->GetDlgItem(IDC_PROMPT_LINK);
   instance->link_.reset(new CHyperLink());
   instance->link_->SubclassWindow(rte);
   instance->link_->SetHyperLinkExtendedStyle(HLINK_NOTIFYBUTTON,
                                              HLINK_NOTIFYBUTTON);
 
+  CStatic icon_control(instance->GetDlgItem(IDC_PROMPT_ICON));
+
+  instance->icon_ = static_cast<HICON>(
+      ::LoadImage(_AtlBaseModule.GetResourceInstance(),
+                  MAKEINTRESOURCE(IDI_CHROME_FRAME_ICON),
+                  IMAGE_ICON, 16, 16, 0));
+
+  if (instance->icon_)
+    icon_control.SetIcon(instance->icon_);
+
   return instance;
 }
 
 void ReadyPromptWindow::OnDestroy() {
   frame_ = NULL;
 }
 
 BOOL ReadyPromptWindow::OnInitDialog(CWindow wndFocus, LPARAM lInitParam) {
   DlgResize_Init(false);  // false => 'no gripper'
   return TRUE;
@@ skipping 30 matching lines @@
                                        LPNMHDR /*lParam*/,
                                        BOOL& /*bHandled*/) {
   url_launcher_->LaunchUrl(SimpleResourceLoader::Get(
       IDS_CHROME_FRAME_READY_MODE_LEARN_MORE_URL));
   return 0;
 }
 
 void ReadyPromptWindow::OnFinalMessage(HWND) {
   delete this;
 }