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

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

Issue 1387383004: Plumb NotifierId to status icon balloons (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@notif_cleanup
Patch Set: Rebase Created 5 years, 2 months 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 10 matching lines...) Expand all
21 class StatusIconMac : public StatusIcon { 21 class StatusIconMac : public StatusIcon {
22 public: 22 public:
23 StatusIconMac(); 23 StatusIconMac();
24 ~StatusIconMac() override; 24 ~StatusIconMac() override;
25 25
26 // Overridden from StatusIcon. 26 // Overridden from StatusIcon.
27 void SetImage(const gfx::ImageSkia& image) override; 27 void SetImage(const gfx::ImageSkia& image) override;
28 void SetToolTip(const base::string16& tool_tip) override; 28 void SetToolTip(const base::string16& tool_tip) override;
29 void DisplayBalloon(const gfx::ImageSkia& icon, 29 void DisplayBalloon(const gfx::ImageSkia& icon,
30 const base::string16& title, 30 const base::string16& title,
31 const base::string16& contents) override; 31 const base::string16& contents,
32 const message_center::NotifierId& notifier_id) override;
32 33
33 bool HasStatusIconMenu(); 34 bool HasStatusIconMenu();
34 35
35 protected: 36 protected:
36 // Overridden from StatusIcon. 37 // Overridden from StatusIcon.
37 void UpdatePlatformContextMenu(StatusIconMenuModel* model) override; 38 void UpdatePlatformContextMenu(StatusIconMenuModel* model) override;
38 39
39 private: 40 private:
40 FRIEND_TEST_ALL_PREFIXES(StatusIconMacTest, CreateMenu); 41 FRIEND_TEST_ALL_PREFIXES(StatusIconMacTest, CreateMenu);
41 FRIEND_TEST_ALL_PREFIXES(StatusIconMacTest, MenuToolTip); 42 FRIEND_TEST_ALL_PREFIXES(StatusIconMacTest, MenuToolTip);
(...skipping 13 matching lines...) Expand all
55 base::scoped_nsobject<NSString> toolTip_; 56 base::scoped_nsobject<NSString> toolTip_;
56 57
57 // Status menu shown when right-clicking the system icon, if it has been 58 // Status menu shown when right-clicking the system icon, if it has been
58 // created by |UpdatePlatformContextMenu|. 59 // created by |UpdatePlatformContextMenu|.
59 base::scoped_nsobject<MenuController> menu_; 60 base::scoped_nsobject<MenuController> menu_;
60 61
61 DISALLOW_COPY_AND_ASSIGN(StatusIconMac); 62 DISALLOW_COPY_AND_ASSIGN(StatusIconMac);
62 }; 63 };
63 64
64 #endif // CHROME_BROWSER_UI_COCOA_STATUS_ICONS_STATUS_ICON_MAC_H_ 65 #endif // CHROME_BROWSER_UI_COCOA_STATUS_ICONS_STATUS_ICON_MAC_H_
OLDNEW
« no previous file with comments | « chrome/browser/status_icons/status_tray_unittest.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