Further modifications to the Ready Mode UI in response to feedback. Height, icon dimensions, text positioning are same as IE infobars. Buttons now implement user selected theme.

BUG=None
TEST=None
Review URL: http://codereview.chromium.org/6321025

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78311 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 27 insertions, 0 deletions

diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
index 2cdb516..2dad2bc 100644
--- a/chrome_frame/chrome_frame.gyp
+++ b/chrome_frame/chrome_frame.gyp
@@ -53,6 +53,7 @@
       '../skia/skia.gyp:skia',
       '../third_party/npapi/npapi.gyp:npapi',
     ],
+    'defines': [ 'ISOLATION_AWARE_ENABLED=1' ],
     'include_dirs': [
       # all our own includes are relative to src/
       '..',
@@ -1021,6 +1022,10 @@
               # Set /SUBSYSTEM:WINDOWS (for consistency).
               'SubSystem': '2',
             },
+            'VCManifestTool': {
+              'AdditionalManifestFiles':
+                  '$(ProjectDir)\\resources\\npchrome_frame.dll.manifest',
+            },
           },
         }],
       ],
diff --git a/chrome_frame/ready_mode/internal/ready_prompt_window.cc b/chrome_frame/ready_mode/internal/ready_prompt_window.cc
index 2c1e3e5..39ccbfa 100644
--- a/chrome_frame/ready_mode/internal/ready_prompt_window.cc
+++ b/chrome_frame/ready_mode/internal/ready_prompt_window.cc
@@ -28,9 +28,12 @@ ReadyPromptWindow::ReadyPromptWindow(
     : 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(
@@ -58,6 +61,16 @@ base::WeakPtr<ReadyPromptWindow> ReadyPromptWindow::CreateInstance(
   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;
 }
 
diff --git a/chrome_frame/ready_mode/internal/ready_prompt_window.h b/chrome_frame/ready_mode/internal/ready_prompt_window.h
index 5dc87ae..12676a9 100644
--- a/chrome_frame/ready_mode/internal/ready_prompt_window.h
+++ b/chrome_frame/ready_mode/internal/ready_prompt_window.h
@@ -99,6 +99,7 @@ class ReadyPromptWindow
   scoped_ptr<WTL::CHyperLink> link_;
   scoped_ptr<UrlLauncher> url_launcher_;
 
+  HICON icon_;
   base::WeakPtrFactory<ReadyPromptWindow> weak_ptr_factory_;
   DISALLOW_COPY_AND_ASSIGN(ReadyPromptWindow);
 };  // class ReadyPromptWindow
diff --git a/chrome_frame/resources/npchrome_frame.dll.manifest b/chrome_frame/resources/npchrome_frame.dll.manifest
new file mode 100644
index 0000000..03bfc84
--- /dev/null
+++ b/chrome_frame/resources/npchrome_frame.dll.manifest
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">

+  <dependency>

+    <dependentAssembly>

+      <assemblyIdentity type="Win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="X86" publicKeyToken="6595b64144ccf1df" language="*"></assemblyIdentity>

+    </dependentAssembly>

+  </dependency>

+</assembly>
\ No newline at end of file