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

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

Issue 8414024: Analyzed the problem and tested 30+ times the affected and related tests without problems. Test f... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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/compiler_specific.h"
12 #include "base/memory/scoped_nsobject.h" 12 #include "base/memory/scoped_nsobject.h"
13 #include "base/string16.h" 13 #include "base/string16.h"
14 #include "chrome/browser/status_icons/desktop_notification_balloon.h"
14 #include "chrome/browser/status_icons/status_icon.h" 15 #include "chrome/browser/status_icons/status_icon.h"
15 16
16 class SkBitmap; 17 class SkBitmap;
17 @class NSStatusItem; 18 @class NSStatusItem;
18 @class StatusItemController; 19 @class StatusItemController;
19 20
20 class StatusIconMac : public StatusIcon { 21 class StatusIconMac : public StatusIcon {
21 public: 22 public:
22 StatusIconMac(); 23 StatusIconMac();
23 virtual ~StatusIconMac(); 24 virtual ~StatusIconMac();
24 25
25 // Overridden from StatusIcon 26 // Overridden from StatusIcon.
26 virtual void SetImage(const SkBitmap& image) OVERRIDE; 27 virtual void SetImage(const SkBitmap& image) OVERRIDE;
27 virtual void SetPressedImage(const SkBitmap& image) OVERRIDE; 28 virtual void SetPressedImage(const SkBitmap& image) OVERRIDE;
28 virtual void SetToolTip(const string16& tool_tip) OVERRIDE; 29 virtual void SetToolTip(const string16& tool_tip) OVERRIDE;
29 virtual void DisplayBalloon(const SkBitmap& icon, 30 virtual void DisplayBalloon(const SkBitmap& icon,
30 const string16& title, 31 const string16& title,
31 const string16& contents) OVERRIDE; 32 const string16& contents) OVERRIDE;
32 33
33 protected: 34 protected:
34 // Overridden from StatusIcon. 35 // Overridden from StatusIcon.
35 virtual void UpdatePlatformContextMenu(ui::MenuModel* menu); 36 virtual void UpdatePlatformContextMenu(ui::MenuModel* menu);
36 37
37 private: 38 private:
38 // Getter for item_ that allows lazy initialization. 39 // Getter for item_ that allows lazy initialization.
39 NSStatusItem* item(); 40 NSStatusItem* item();
40 scoped_nsobject<NSStatusItem> item_; 41 scoped_nsobject<NSStatusItem> item_;
41 42
42 scoped_nsobject<StatusItemController> controller_; 43 scoped_nsobject<StatusItemController> controller_;
43 44
45 // Notification balloon.
46 DesktopNotificationBalloon notification_;
47
44 DISALLOW_COPY_AND_ASSIGN(StatusIconMac); 48 DISALLOW_COPY_AND_ASSIGN(StatusIconMac);
45 }; 49 };
46 50
47 #endif // CHROME_BROWSER_UI_COCOA_STATUS_ICONS_STATUS_ICON_MAC_H_ 51 #endif // CHROME_BROWSER_UI_COCOA_STATUS_ICONS_STATUS_ICON_MAC_H_
OLDNEW
« no previous file with comments | « chrome/browser/status_icons/desktop_notification_balloon.cc ('k') | chrome/browser/ui/cocoa/status_icons/status_icon_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698