diff options
| author | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-30 20:44:52 +0000 |
|---|---|---|
| committer | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-30 20:44:52 +0000 |
| commit | 3da61f19368b9d3517b84cec2bb4d111037933bd (patch) | |
| tree | e048d6a1c0ec4b6265401cff884a44f620647adc | |
| parent | 4d5e7a6b1a52c7af83aa3d88bf92cf59f5007ff5 (diff) | |
| download | chromium_src-3da61f19368b9d3517b84cec2bb4d111037933bd.zip chromium_src-3da61f19368b9d3517b84cec2bb4d111037933bd.tar.gz chromium_src-3da61f19368b9d3517b84cec2bb4d111037933bd.tar.bz2 | |
Revert 43099 - Windows implementation of StatusIcon::SetToolTip()
I will resubmit with the proper patch attribution.
TBR=atwilson@google.com
Review URL: http://codereview.chromium.org/1558006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43133 0039d316-1c4b-4281-b951-d872f2087c98
| -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, 1 insertions, 10 deletions
diff --git a/chrome/browser/status_icons/status_tray_manager.cc b/chrome/browser/status_icons/status_tray_manager.cc index b5465c3..39b6c85 100644 --- a/chrome/browser/status_icons/status_tray_manager.cc +++ b/chrome/browser/status_icons/status_tray_manager.cc @@ -4,7 +4,6 @@ #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" @@ -13,7 +12,6 @@ #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() { @@ -36,7 +34,6 @@ 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 71cd593..4ba6603 100644 --- a/chrome/browser/views/status_icons/status_icon_win.cc +++ b/chrome/browser/views/status_icons/status_icon_win.cc @@ -48,13 +48,7 @@ void StatusIconWin::SetPressedImage(const SkBitmap& image) { } void StatusIconWin::SetToolTip(const string16& tool_tip) { - // 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); + // TODO(atwilson): Implement this (http://crbug.com/38993). } void StatusIconWin::InitIconData(NOTIFYICONDATA* icon_data) { |