summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-06 08:03:15 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-06 08:03:15 +0000
commitb598f99a57d92189b266d0ec4ac39ec1c75db011 (patch)
tree96af1ed238f08b4366ca178c69a2d0ad161d100d /chrome/browser
parentf9fdb0727cff50427843301d7dfff988daa4a153 (diff)
downloadchromium_src-b598f99a57d92189b266d0ec4ac39ec1c75db011.zip
chromium_src-b598f99a57d92189b266d0ec4ac39ec1c75db011.tar.gz
chromium_src-b598f99a57d92189b266d0ec4ac39ec1c75db011.tar.bz2
Reset the window favicon when the throbber is complete. This fixes the bug using
the Vista frame for popups that the throbber icon is never replaced. http://crbug.com/8078 Review URL: http://codereview.chromium.org/113024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15396 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/views/frame/glass_browser_frame_view.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/views/frame/glass_browser_frame_view.cc b/chrome/browser/views/frame/glass_browser_frame_view.cc
index b8758b9..e274437 100644
--- a/chrome/browser/views/frame/glass_browser_frame_view.cc
+++ b/chrome/browser/views/frame/glass_browser_frame_view.cc
@@ -395,8 +395,14 @@ void GlassBrowserFrameView::StartThrobber() {
}
void GlassBrowserFrameView::StopThrobber() {
- if (throbber_running_)
+ if (throbber_running_) {
throbber_running_ = false;
+
+ // This will reset the small icon which we set in the throbber code.
+ // Windows will then pick up the default icon from the window class.
+ SendMessage(frame_->GetNativeView(), WM_SETICON,
+ static_cast<WPARAM>(ICON_SMALL), NULL);
+ }
}
void GlassBrowserFrameView::DisplayNextThrobberFrame() {