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

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

Issue 628773002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[t-v]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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_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 28 matching lines...) Expand all
39 void HandleBalloonClickEvent(); 39 void HandleBalloonClickEvent();
40 40
41 // Re-creates the status tray icon now after the taskbar has been created. 41 // Re-creates the status tray icon now after the taskbar has been created.
42 void ResetIcon(); 42 void ResetIcon();
43 43
44 UINT icon_id() const { return icon_id_; } 44 UINT icon_id() const { return icon_id_; }
45 HWND window() const { return window_; } 45 HWND window() const { return window_; }
46 UINT message_id() const { return message_id_; } 46 UINT message_id() const { return message_id_; }
47 47
48 // Overridden from StatusIcon: 48 // Overridden from StatusIcon:
49 virtual void SetImage(const gfx::ImageSkia& image) OVERRIDE; 49 virtual void SetImage(const gfx::ImageSkia& image) override;
50 virtual void SetToolTip(const base::string16& tool_tip) OVERRIDE; 50 virtual void SetToolTip(const base::string16& tool_tip) override;
51 virtual void DisplayBalloon(const gfx::ImageSkia& icon, 51 virtual void DisplayBalloon(const gfx::ImageSkia& icon,
52 const base::string16& title, 52 const base::string16& title,
53 const base::string16& contents) OVERRIDE; 53 const base::string16& contents) override;
54 virtual void ForceVisible() OVERRIDE; 54 virtual void ForceVisible() override;
55 55
56 protected: 56 protected:
57 // Overridden from StatusIcon: 57 // Overridden from StatusIcon:
58 virtual void UpdatePlatformContextMenu(StatusIconMenuModel* menu) OVERRIDE; 58 virtual void UpdatePlatformContextMenu(StatusIconMenuModel* menu) override;
59 59
60 private: 60 private:
61 void InitIconData(NOTIFYICONDATA* icon_data); 61 void InitIconData(NOTIFYICONDATA* icon_data);
62 62
63 // The tray that owns us. Weak. 63 // The tray that owns us. Weak.
64 StatusTrayWin* tray_; 64 StatusTrayWin* tray_;
65 65
66 // The unique ID corresponding to this icon. 66 // The unique ID corresponding to this icon.
67 UINT icon_id_; 67 UINT icon_id_;
68 68
(...skipping 12 matching lines...) Expand all
81 // Not owned. 81 // Not owned.
82 ui::MenuModel* menu_model_; 82 ui::MenuModel* menu_model_;
83 83
84 // Context menu associated with this icon (if any). 84 // Context menu associated with this icon (if any).
85 scoped_ptr<views::MenuRunner> menu_runner_; 85 scoped_ptr<views::MenuRunner> menu_runner_;
86 86
87 DISALLOW_COPY_AND_ASSIGN(StatusIconWin); 87 DISALLOW_COPY_AND_ASSIGN(StatusIconWin);
88 }; 88 };
89 89
90 #endif // CHROME_BROWSER_UI_VIEWS_STATUS_ICONS_STATUS_ICON_WIN_H_ 90 #endif // CHROME_BROWSER_UI_VIEWS_STATUS_ICONS_STATUS_ICON_WIN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698