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

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

Issue 6040002: Remove more 'using' declarations of Scoped* from scoped_handle_win.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: typedef Created 9 years, 12 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
« no previous file with comments | « chrome/browser/ui/views/dropdown_bar_host.cc ('k') | views/view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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>
11 11
12 #include "base/scoped_handle_win.h" 12 #include "base/win/scoped_gdi_object.h"
13 #include "base/scoped_ptr.h" 13 #include "base/scoped_ptr.h"
14 #include "chrome/browser/status_icons/status_icon.h" 14 #include "chrome/browser/status_icons/status_icon.h"
15 15
16 namespace views { 16 namespace views {
17 class Menu2; 17 class Menu2;
18 } 18 }
19 19
20 class StatusIconWin : public StatusIcon { 20 class StatusIconWin : public StatusIcon {
21 public: 21 public:
22 // Constructor which provides this icon's unique ID and messaging window. 22 // Constructor which provides this icon's unique ID and messaging window.
(...skipping 24 matching lines...) Expand all
47 // The unique ID corresponding to this icon. 47 // The unique ID corresponding to this icon.
48 UINT icon_id_; 48 UINT icon_id_;
49 49
50 // Window used for processing messages from this icon. 50 // Window used for processing messages from this icon.
51 HWND window_; 51 HWND window_;
52 52
53 // The message identifier used for status icon messages. 53 // The message identifier used for status icon messages.
54 UINT message_id_; 54 UINT message_id_;
55 55
56 // The currently-displayed icon for the window. 56 // The currently-displayed icon for the window.
57 ScopedHICON icon_; 57 base::win::ScopedHICON icon_;
58 58
59 // Context menu associated with this icon (if any). 59 // Context menu associated with this icon (if any).
60 scoped_ptr<views::Menu2> context_menu_; 60 scoped_ptr<views::Menu2> context_menu_;
61 61
62 DISALLOW_COPY_AND_ASSIGN(StatusIconWin); 62 DISALLOW_COPY_AND_ASSIGN(StatusIconWin);
63 }; 63 };
64 64
65 #endif // CHROME_BROWSER_UI_VIEWS_STATUS_ICONS_STATUS_ICON_WIN_H_ 65 #endif // CHROME_BROWSER_UI_VIEWS_STATUS_ICONS_STATUS_ICON_WIN_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/dropdown_bar_host.cc ('k') | views/view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698