summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa/status_icons
diff options
context:
space:
mode:
authoratwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-18 20:55:45 +0000
committeratwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-18 20:55:45 +0000
commit4c793f0298cbafa6826ef1bc2d85d92bf64320ba (patch)
tree5e6e6a34051417ee4c6847f397713c5d56e99d0d /chrome/browser/cocoa/status_icons
parent0906270c4485c74cf35fed76aee21458702ce68c (diff)
downloadchromium_src-4c793f0298cbafa6826ef1bc2d85d92bf64320ba.zip
chromium_src-4c793f0298cbafa6826ef1bc2d85d92bf64320ba.tar.gz
chromium_src-4c793f0298cbafa6826ef1bc2d85d92bf64320ba.tar.bz2
Added BackgroundModeManager which tracks when background apps are loaded/unloaded
and puts Chrome into BackgroundMode appropriately. Added EXTENSION_UNINSTALLING notification which is sent out when a notification is about to be uninstalled. Refactored StatusTray code to move StatusTray under the profile rather than attaching it to the browser process, and removed StatusTrayManager which is no longer needed now that BackgroundModeManager handles creating status icons. BUG=43382 TEST=background_mode_manager_unittests.cc Review URL: http://codereview.chromium.org/3134011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56596 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/status_icons')
-rw-r--r--chrome/browser/cocoa/status_icons/status_tray_mac.h2
-rw-r--r--chrome/browser/cocoa/status_icons/status_tray_mac.mm2
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/cocoa/status_icons/status_tray_mac.h b/chrome/browser/cocoa/status_icons/status_tray_mac.h
index 074251b..3552db4 100644
--- a/chrome/browser/cocoa/status_icons/status_tray_mac.h
+++ b/chrome/browser/cocoa/status_icons/status_tray_mac.h
@@ -14,7 +14,7 @@ class StatusTrayMac : public StatusTray {
protected:
// Factory method for creating a status icon.
- virtual StatusIcon* CreateStatusIcon();
+ virtual StatusIcon* CreatePlatformStatusIcon();
private:
DISALLOW_COPY_AND_ASSIGN(StatusTrayMac);
diff --git a/chrome/browser/cocoa/status_icons/status_tray_mac.mm b/chrome/browser/cocoa/status_icons/status_tray_mac.mm
index 8c9449b..d4e176f 100644
--- a/chrome/browser/cocoa/status_icons/status_tray_mac.mm
+++ b/chrome/browser/cocoa/status_icons/status_tray_mac.mm
@@ -13,6 +13,6 @@ StatusTray* StatusTray::Create() {
StatusTrayMac::StatusTrayMac() {
}
-StatusIcon* StatusTrayMac::CreateStatusIcon() {
+StatusIcon* StatusTrayMac::CreatePlatformStatusIcon() {
return new StatusIconMac();
}