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

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

Issue 1100223002: Update {virtual,override} to follow C++11 style in chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 8 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_VIEWS_STATUS_ICONS_STATUS_TRAY_WIN_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_STATUS_ICONS_STATUS_TRAY_WIN_H_
6 #define CHROME_BROWSER_UI_VIEWS_STATUS_ICONS_STATUS_TRAY_WIN_H_ 6 #define CHROME_BROWSER_UI_VIEWS_STATUS_ICONS_STATUS_TRAY_WIN_H_
7 7
8 #include <windows.h> 8 #include <windows.h>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 10 matching lines...) Expand all
21 virtual ~StatusTrayStateChangerProxy() {} 21 virtual ~StatusTrayStateChangerProxy() {}
22 22
23 // Called by StatusTrayWin to request upgraded visibility on the icon 23 // Called by StatusTrayWin to request upgraded visibility on the icon
24 // represented by the |icon_id|, |window| pair. 24 // represented by the |icon_id|, |window| pair.
25 virtual void EnqueueChange(UINT icon_id, HWND window) = 0; 25 virtual void EnqueueChange(UINT icon_id, HWND window) = 0;
26 }; 26 };
27 27
28 class StatusTrayWin : public StatusTray { 28 class StatusTrayWin : public StatusTray {
29 public: 29 public:
30 StatusTrayWin(); 30 StatusTrayWin();
31 ~StatusTrayWin(); 31 ~StatusTrayWin() override;
32 32
33 void UpdateIconVisibilityInBackground(StatusIconWin* status_icon); 33 void UpdateIconVisibilityInBackground(StatusIconWin* status_icon);
34 34
35 // Exposed for testing. 35 // Exposed for testing.
36 LRESULT CALLBACK 36 LRESULT CALLBACK
37 WndProc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam); 37 WndProc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam);
38 38
39 protected: 39 protected:
40 // Overriden from StatusTray: 40 // Overriden from StatusTray:
41 virtual StatusIcon* CreatePlatformStatusIcon(StatusIconType type, 41 StatusIcon* CreatePlatformStatusIcon(StatusIconType type,
42 const gfx::ImageSkia& image, 42 const gfx::ImageSkia& image,
43 const base::string16& tool_tip) 43 const base::string16& tool_tip) override;
44 override;
45 44
46 private: 45 private:
47 FRIEND_TEST_ALL_PREFIXES(StatusTrayWinTest, EnsureVisibleTest); 46 FRIEND_TEST_ALL_PREFIXES(StatusTrayWinTest, EnsureVisibleTest);
48 47
49 // Static callback invoked when a message comes in to our messaging window. 48 // Static callback invoked when a message comes in to our messaging window.
50 static LRESULT CALLBACK 49 static LRESULT CALLBACK
51 WndProcStatic(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam); 50 WndProcStatic(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam);
52 51
53 UINT NextIconId(); 52 UINT NextIconId();
54 53
(...skipping 18 matching lines...) Expand all
73 72
74 // Manages changes performed on a background thread to manipulate visibility 73 // Manages changes performed on a background thread to manipulate visibility
75 // of notification icons. 74 // of notification icons.
76 scoped_ptr<StatusTrayStateChangerProxy> state_changer_proxy_; 75 scoped_ptr<StatusTrayStateChangerProxy> state_changer_proxy_;
77 76
78 DISALLOW_COPY_AND_ASSIGN(StatusTrayWin); 77 DISALLOW_COPY_AND_ASSIGN(StatusTrayWin);
79 }; 78 };
80 79
81 #endif // CHROME_BROWSER_UI_VIEWS_STATUS_ICONS_STATUS_TRAY_WIN_H_ 80 #endif // CHROME_BROWSER_UI_VIEWS_STATUS_ICONS_STATUS_TRAY_WIN_H_
82 81
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698