diff options
| author | erikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-16 00:36:19 +0000 |
|---|---|---|
| committer | erikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-16 00:36:19 +0000 |
| commit | be6a3cd3832ee59b2d2428dfa5204c78254d8b3c (patch) | |
| tree | f9394966df353800dc0d9d08b4b10a9b52f1ec98 /chrome_frame/ready_mode | |
| parent | bfb95f5dc2660a179c45066225a366b1ade2a81f (diff) | |
| download | chromium_src-be6a3cd3832ee59b2d2428dfa5204c78254d8b3c.zip chromium_src-be6a3cd3832ee59b2d2428dfa5204c78254d8b3c.tar.gz chromium_src-be6a3cd3832ee59b2d2428dfa5204c78254d8b3c.tar.bz2 | |
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
Diffstat (limited to 'chrome_frame/ready_mode')
| -rw-r--r-- | chrome_frame/ready_mode/internal/ready_prompt_window.cc | 13 | ||||
| -rw-r--r-- | chrome_frame/ready_mode/internal/ready_prompt_window.h | 1 |
2 files changed, 14 insertions, 0 deletions
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 |