| OLD | NEW |
| 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_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 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <windows.h> | 9 #include <windows.h> |
| 10 #include <shellapi.h> | 10 #include <shellapi.h> |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 | 56 |
| 57 // Window used for processing messages from this icon. | 57 // Window used for processing messages from this icon. |
| 58 HWND window_; | 58 HWND window_; |
| 59 | 59 |
| 60 // The message identifier used for status icon messages. | 60 // The message identifier used for status icon messages. |
| 61 UINT message_id_; | 61 UINT message_id_; |
| 62 | 62 |
| 63 // The currently-displayed icon for the window. | 63 // The currently-displayed icon for the window. |
| 64 base::win::ScopedHICON icon_; | 64 base::win::ScopedHICON icon_; |
| 65 | 65 |
| 66 // The currently-displayed icon for the notification balloon. |
| 67 base::win::ScopedHICON balloon_icon_; |
| 68 |
| 66 #if !defined(USE_AURA) | 69 #if !defined(USE_AURA) |
| 67 // Context menu associated with this icon (if any). | 70 // Context menu associated with this icon (if any). |
| 68 scoped_ptr<views::Menu2> context_menu_; | 71 scoped_ptr<views::Menu2> context_menu_; |
| 69 #endif | 72 #endif |
| 70 | 73 |
| 71 DISALLOW_COPY_AND_ASSIGN(StatusIconWin); | 74 DISALLOW_COPY_AND_ASSIGN(StatusIconWin); |
| 72 }; | 75 }; |
| 73 | 76 |
| 74 #endif // CHROME_BROWSER_UI_VIEWS_STATUS_ICONS_STATUS_ICON_WIN_H_ | 77 #endif // CHROME_BROWSER_UI_VIEWS_STATUS_ICONS_STATUS_ICON_WIN_H_ |
| OLD | NEW |