diff options
-rw-r--r-- | chrome/browser/status_icons/status_tray_manager.cc | 3 | ||||
-rw-r--r-- | chrome/browser/views/status_icons/status_icon_win.cc | 8 |
2 files changed, 10 insertions, 1 deletions
diff --git a/chrome/browser/status_icons/status_tray_manager.cc b/chrome/browser/status_icons/status_tray_manager.cc index 39b6c85..b5465c3 100644 --- a/chrome/browser/status_icons/status_tray_manager.cc +++ b/chrome/browser/status_icons/status_tray_manager.cc @@ -4,6 +4,7 @@ #include "chrome/browser/status_icons/status_tray_manager.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/logging.h" #include "base/string_util.h" @@ -12,6 +13,7 @@ #include "chrome/browser/browser_window.h" #include "chrome/browser/status_icons/status_tray.h" #include "grit/browser_resources.h" +#include "grit/chromium_strings.h" #include "grit/theme_resources.h" StatusTrayManager::StatusTrayManager() { @@ -34,6 +36,7 @@ void StatusTrayManager::Init(Profile* profile) { IDR_STATUS_TRAY_ICON_PRESSED); icon->SetImage(*bitmap); icon->SetPressedImage(*pressed); + icon->SetToolTip(l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); icon->AddObserver(this); } #endif diff --git a/chrome/browser/views/status_icons/status_icon_win.cc b/chrome/browser/views/status_icons/status_icon_win.cc index 4ba6603..71cd593 100644 --- a/chrome/browser/views/status_icons/status_icon_win.cc +++ b/chrome/browser/views/status_icons/status_icon_win.cc @@ -48,7 +48,13 @@ void StatusIconWin::SetPressedImage(const SkBitmap& image) { } void StatusIconWin::SetToolTip(const string16& tool_tip) { - // TODO(atwilson): Implement this (http://crbug.com/38993). + // Create the icon. + NOTIFYICONDATA icon_data; + InitIconData(&icon_data); + icon_data.uFlags = NIF_TIP; + wcscpy_s(icon_data.szTip, tool_tip.c_str()); + BOOL result = Shell_NotifyIcon(NIM_MODIFY, &icon_data); + DCHECK(result); } void StatusIconWin::InitIconData(NOTIFYICONDATA* icon_data) { |