Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(176)

Side by Side Diff: chrome/browser/ui/cocoa/status_icons/status_icon_mac.h

Issue 8351004: Add an extra argument to the DisplayBalloon method to support custom notification icons. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixing argument order as suggested. Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_COCOA_STATUS_ICONS_STATUS_ICON_MAC_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_STATUS_ICONS_STATUS_ICON_MAC_H_
6 #define CHROME_BROWSER_UI_COCOA_STATUS_ICONS_STATUS_ICON_MAC_H_ 6 #define CHROME_BROWSER_UI_COCOA_STATUS_ICONS_STATUS_ICON_MAC_H_
7 #pragma once 7 #pragma once
8 8
9 #import <Cocoa/Cocoa.h> 9 #import <Cocoa/Cocoa.h>
10 10
11 #include "base/compiler_specific.h"
11 #include "base/memory/scoped_nsobject.h" 12 #include "base/memory/scoped_nsobject.h"
12 #include "base/string16.h" 13 #include "base/string16.h"
13 #include "chrome/browser/status_icons/status_icon.h" 14 #include "chrome/browser/status_icons/status_icon.h"
14 15
15 class SkBitmap; 16 class SkBitmap;
16 @class NSStatusItem; 17 @class NSStatusItem;
17 @class StatusItemController; 18 @class StatusItemController;
18 19
19 class StatusIconMac : public StatusIcon { 20 class StatusIconMac : public StatusIcon {
20 public: 21 public:
21 StatusIconMac(); 22 StatusIconMac();
22 virtual ~StatusIconMac(); 23 virtual ~StatusIconMac();
23 24
24 // Overridden from StatusIcon 25 // Overridden from StatusIcon
25 virtual void SetImage(const SkBitmap& image); 26 virtual void SetImage(const SkBitmap& image) OVERRIDE;
26 virtual void SetPressedImage(const SkBitmap& image); 27 virtual void SetPressedImage(const SkBitmap& image) OVERRIDE;
27 virtual void SetToolTip(const string16& tool_tip); 28 virtual void SetToolTip(const string16& tool_tip) OVERRIDE;
28 virtual void DisplayBalloon(const string16& title, const string16& contents); 29 virtual void DisplayBalloon(const SkBitmap& icon,
30 const string16& title,
31 const string16& contents) OVERRIDE;
29 32
30 protected: 33 protected:
31 // Overridden from StatusIcon. 34 // Overridden from StatusIcon.
32 virtual void UpdatePlatformContextMenu(ui::MenuModel* menu); 35 virtual void UpdatePlatformContextMenu(ui::MenuModel* menu);
33 36
34 private: 37 private:
35 // Getter for item_ that allows lazy initialization. 38 // Getter for item_ that allows lazy initialization.
36 NSStatusItem* item(); 39 NSStatusItem* item();
37 scoped_nsobject<NSStatusItem> item_; 40 scoped_nsobject<NSStatusItem> item_;
38 41
39 scoped_nsobject<StatusItemController> controller_; 42 scoped_nsobject<StatusItemController> controller_;
40 43
41 DISALLOW_COPY_AND_ASSIGN(StatusIconMac); 44 DISALLOW_COPY_AND_ASSIGN(StatusIconMac);
42 }; 45 };
43 46
44
45 #endif // CHROME_BROWSER_UI_COCOA_STATUS_ICONS_STATUS_ICON_MAC_H_ 47 #endif // CHROME_BROWSER_UI_COCOA_STATUS_ICONS_STATUS_ICON_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698