diff options
| author | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-14 18:06:20 +0000 |
|---|---|---|
| committer | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-14 18:06:20 +0000 |
| commit | 9a4031b02a081ff0d58204215519c73abe02f55e (patch) | |
| tree | a0d79aa4e239b335a64a9ce45794460706cfe217 /chrome/browser | |
| parent | 4549b0c7c309791cec499dc858609a07ae95a207 (diff) | |
| download | chromium_src-9a4031b02a081ff0d58204215519c73abe02f55e.zip chromium_src-9a4031b02a081ff0d58204215519c73abe02f55e.tar.gz chromium_src-9a4031b02a081ff0d58204215519c73abe02f55e.tar.bz2 | |
status_icons: Fix include issues.
BUG=None
TEST=compiles
Patch from Thiago Farina <thiago.farina@gmail.com>
Review URL: http://codereview.chromium.org/1547020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44499 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
5 files changed, 2 insertions, 15 deletions
diff --git a/chrome/browser/status_icons/status_icon.cc b/chrome/browser/status_icons/status_icon.cc index 9eada2e..9fed83d 100644 --- a/chrome/browser/status_icons/status_icon.cc +++ b/chrome/browser/status_icons/status_icon.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include <algorithm> - #include "chrome/browser/status_icons/status_icon.h" void StatusIcon::AddObserver(Observer* observer) { @@ -17,4 +15,3 @@ void StatusIcon::RemoveObserver(Observer* observer) { void StatusIcon::DispatchClickEvent() { FOR_EACH_OBSERVER(Observer, observers_, OnClicked()); } - diff --git a/chrome/browser/status_icons/status_icon.h b/chrome/browser/status_icons/status_icon.h index 00fc48d..f7e0897 100644 --- a/chrome/browser/status_icons/status_icon.h +++ b/chrome/browser/status_icons/status_icon.h @@ -5,8 +5,6 @@ #ifndef CHROME_BROWSER_STATUS_ICONS_STATUS_ICON_H_ #define CHROME_BROWSER_STATUS_ICONS_STATUS_ICON_H_ -#include <vector> - #include "base/observer_list.h" #include "base/string16.h" @@ -49,5 +47,4 @@ class StatusIcon { DISALLOW_COPY_AND_ASSIGN(StatusIcon); }; - #endif // CHROME_BROWSER_STATUS_ICONS_STATUS_ICON_H_ diff --git a/chrome/browser/views/status_icons/status_icon_win.cc b/chrome/browser/views/status_icons/status_icon_win.cc index 71cd593..53cfcad 100644 --- a/chrome/browser/views/status_icons/status_icon_win.cc +++ b/chrome/browser/views/status_icons/status_icon_win.cc @@ -4,11 +4,7 @@ #include "chrome/browser/views/status_icons/status_icon_win.h" -#include <windows.h> -#include <shellapi.h> - #include "gfx/icon_util.h" -#include "base/logging.h" #include "base/sys_string_conversions.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/browser/views/status_icons/status_icon_win.h b/chrome/browser/views/status_icons/status_icon_win.h index be3c9b0..46be5ae 100644 --- a/chrome/browser/views/status_icons/status_icon_win.h +++ b/chrome/browser/views/status_icons/status_icon_win.h @@ -9,18 +9,15 @@ #include <shellapi.h> #include "base/scoped_handle_win.h" -#include "base/string16.h" #include "chrome/browser/status_icons/status_icon.h" -class SkBitmap; - class StatusIconWin : public StatusIcon { public: // Constructor which provides this icon's unique ID and messaging window. StatusIconWin(UINT id, HWND window, UINT message); virtual ~StatusIconWin(); - // Overridden from StatusIcon + // Overridden from StatusIcon: virtual void SetImage(const SkBitmap& image); virtual void SetPressedImage(const SkBitmap& image); virtual void SetToolTip(const string16& tool_tip); diff --git a/chrome/browser/views/status_icons/status_tray_win.h b/chrome/browser/views/status_icons/status_tray_win.h index 0dbc5cd..f3aa9d1 100644 --- a/chrome/browser/views/status_icons/status_tray_win.h +++ b/chrome/browser/views/status_icons/status_tray_win.h @@ -20,7 +20,7 @@ class StatusTrayWin : public StatusTray { WPARAM wparam, LPARAM lparam); protected: - // Factory method for creating a status icon. + // Overriden from StatusTray: virtual StatusIcon* CreateStatusIcon(); private: |