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

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

Issue 2767893002: Remove ScopedVector from chrome/browser/. (Closed)
Patch Set: Address comments from zea@ Created 3 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
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 <memory> 10 #include <memory>
(...skipping 23 matching lines...) Expand all
34 ~StatusTrayWin() override; 34 ~StatusTrayWin() override;
35 35
36 void UpdateIconVisibilityInBackground(StatusIconWin* status_icon); 36 void UpdateIconVisibilityInBackground(StatusIconWin* status_icon);
37 37
38 // Exposed for testing. 38 // Exposed for testing.
39 LRESULT CALLBACK 39 LRESULT CALLBACK
40 WndProc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam); 40 WndProc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam);
41 41
42 protected: 42 protected:
43 // Overriden from StatusTray: 43 // Overriden from StatusTray:
44 StatusIcon* CreatePlatformStatusIcon(StatusIconType type, 44 std::unique_ptr<StatusIcon> CreatePlatformStatusIcon(
45 const gfx::ImageSkia& image, 45 StatusIconType type,
46 const base::string16& tool_tip) override; 46 const gfx::ImageSkia& image,
47 const base::string16& tool_tip) override;
47 48
48 private: 49 private:
49 FRIEND_TEST_ALL_PREFIXES(StatusTrayWinTest, EnsureVisibleTest); 50 FRIEND_TEST_ALL_PREFIXES(StatusTrayWinTest, EnsureVisibleTest);
50 51
51 // Static callback invoked when a message comes in to our messaging window. 52 // Static callback invoked when a message comes in to our messaging window.
52 static LRESULT CALLBACK 53 static LRESULT CALLBACK
53 WndProcStatic(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam); 54 WndProcStatic(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam);
54 55
55 UINT NextIconId(); 56 UINT NextIconId();
56 57
(...skipping 18 matching lines...) Expand all
75 76
76 // Manages changes performed on a background thread to manipulate visibility 77 // Manages changes performed on a background thread to manipulate visibility
77 // of notification icons. 78 // of notification icons.
78 std::unique_ptr<StatusTrayStateChangerProxy> state_changer_proxy_; 79 std::unique_ptr<StatusTrayStateChangerProxy> state_changer_proxy_;
79 80
80 DISALLOW_COPY_AND_ASSIGN(StatusTrayWin); 81 DISALLOW_COPY_AND_ASSIGN(StatusTrayWin);
81 }; 82 };
82 83
83 #endif // CHROME_BROWSER_UI_VIEWS_STATUS_ICONS_STATUS_TRAY_WIN_H_ 84 #endif // CHROME_BROWSER_UI_VIEWS_STATUS_ICONS_STATUS_TRAY_WIN_H_
84 85
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/status_icons/status_tray_linux.cc ('k') | chrome/browser/ui/views/status_icons/status_tray_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698