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

Side by Side Diff: chrome/browser/ui/views/status_icons/status_icon_win.h

Issue 110693004: Moves the notification icon out of the status area overflow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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 | Annotate | Revision Log
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_VIEWS_STATUS_ICONS_STATUS_ICON_WIN_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_STATUS_ICONS_STATUS_ICON_WIN_H_
6 #define CHROME_BROWSER_UI_VIEWS_STATUS_ICONS_STATUS_ICON_WIN_H_ 6 #define CHROME_BROWSER_UI_VIEWS_STATUS_ICONS_STATUS_ICON_WIN_H_
7 7
8 #include <windows.h> 8 #include <windows.h>
9 #include <shellapi.h> 9 #include <shellapi.h>
10 10
(...skipping 22 matching lines...) Expand all
33 // otherwise displays the context menu if there is one. 33 // otherwise displays the context menu if there is one.
34 void HandleClickEvent(const gfx::Point& cursor_pos, bool left_button_click); 34 void HandleClickEvent(const gfx::Point& cursor_pos, bool left_button_click);
35 35
36 // Handles a click on the balloon from the user. 36 // Handles a click on the balloon from the user.
37 void HandleBalloonClickEvent(); 37 void HandleBalloonClickEvent();
38 38
39 // Re-creates the status tray icon now after the taskbar has been created. 39 // Re-creates the status tray icon now after the taskbar has been created.
40 void ResetIcon(); 40 void ResetIcon();
41 41
42 UINT icon_id() const { return icon_id_; } 42 UINT icon_id() const { return icon_id_; }
43 HWND hwnd() const { return window_; }
sky 2014/03/19 22:26:39 style guide says accessor and member should match
dewittj 2014/03/20 19:31:08 Done.
43 UINT message_id() const { return message_id_; } 44 UINT message_id() const { return message_id_; }
44 45
45 // Overridden from StatusIcon: 46 // Overridden from StatusIcon:
46 virtual void SetImage(const gfx::ImageSkia& image) OVERRIDE; 47 virtual void SetImage(const gfx::ImageSkia& image) OVERRIDE;
47 virtual void SetPressedImage(const gfx::ImageSkia& image) OVERRIDE; 48 virtual void SetPressedImage(const gfx::ImageSkia& image) OVERRIDE;
48 virtual void SetToolTip(const base::string16& tool_tip) OVERRIDE; 49 virtual void SetToolTip(const base::string16& tool_tip) OVERRIDE;
49 virtual void DisplayBalloon(const gfx::ImageSkia& icon, 50 virtual void DisplayBalloon(const gfx::ImageSkia& icon,
50 const base::string16& title, 51 const base::string16& title,
51 const base::string16& contents) OVERRIDE; 52 const base::string16& contents) OVERRIDE;
52 53
53 protected: 54 protected:
54 // Overridden from StatusIcon: 55 // Overridden from StatusIcon:
55 virtual void UpdatePlatformContextMenu( 56 virtual void UpdatePlatformContextMenu(StatusIconMenuModel* menu) OVERRIDE;
56 StatusIconMenuModel* menu) OVERRIDE;
57 57
58 private: 58 private:
59 void InitIconData(NOTIFYICONDATA* icon_data); 59 void InitIconData(NOTIFYICONDATA* icon_data);
60 60
61 // The unique ID corresponding to this icon. 61 // The unique ID corresponding to this icon.
62 UINT icon_id_; 62 UINT icon_id_;
63 63
64 // Window used for processing messages from this icon. 64 // Window used for processing messages from this icon.
65 HWND window_; 65 HWND window_;
66 66
(...skipping 22 matching lines...) Expand all
89 explicit StatusIconMetro(UINT id); 89 explicit StatusIconMetro(UINT id);
90 virtual ~StatusIconMetro(); 90 virtual ~StatusIconMetro();
91 91
92 // Overridden from StatusIcon: 92 // Overridden from StatusIcon:
93 virtual void SetImage(const gfx::ImageSkia& image) OVERRIDE; 93 virtual void SetImage(const gfx::ImageSkia& image) OVERRIDE;
94 virtual void SetPressedImage(const gfx::ImageSkia& image) OVERRIDE; 94 virtual void SetPressedImage(const gfx::ImageSkia& image) OVERRIDE;
95 virtual void SetToolTip(const base::string16& tool_tip) OVERRIDE; 95 virtual void SetToolTip(const base::string16& tool_tip) OVERRIDE;
96 virtual void DisplayBalloon(const gfx::ImageSkia& icon, 96 virtual void DisplayBalloon(const gfx::ImageSkia& icon,
97 const base::string16& title, 97 const base::string16& title,
98 const base::string16& contents) OVERRIDE; 98 const base::string16& contents) OVERRIDE;
99
99 protected: 100 protected:
100 virtual void UpdatePlatformContextMenu( 101 virtual void UpdatePlatformContextMenu(StatusIconMenuModel* menu) OVERRIDE;
101 StatusIconMenuModel* menu) OVERRIDE;
102 102
103 private: 103 private:
104 base::string16 tool_tip_; 104 base::string16 tool_tip_;
105 const UINT id_; 105 const UINT id_;
106 106
107 DISALLOW_COPY_AND_ASSIGN(StatusIconMetro); 107 DISALLOW_COPY_AND_ASSIGN(StatusIconMetro);
108 }; 108 };
109 109
110 #endif // CHROME_BROWSER_UI_VIEWS_STATUS_ICONS_STATUS_ICON_WIN_H_ 110 #endif // CHROME_BROWSER_UI_VIEWS_STATUS_ICONS_STATUS_ICON_WIN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698