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

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

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 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_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
11 #include <memory>
12
11 #include "base/compiler_specific.h" 13 #include "base/compiler_specific.h"
12 #include "base/macros.h" 14 #include "base/macros.h"
13 #include "base/memory/scoped_ptr.h"
14 #include "base/win/scoped_gdi_object.h" 15 #include "base/win/scoped_gdi_object.h"
15 #include "chrome/browser/status_icons/status_icon.h" 16 #include "chrome/browser/status_icons/status_icon.h"
16 17
17 namespace gfx { 18 namespace gfx {
18 class Point; 19 class Point;
19 } 20 }
20 21
21 namespace views { 22 namespace views {
22 class MenuRunner; 23 class MenuRunner;
23 } 24 }
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 // The currently-displayed icon for the window. 77 // The currently-displayed icon for the window.
77 base::win::ScopedHICON icon_; 78 base::win::ScopedHICON icon_;
78 79
79 // The currently-displayed icon for the notification balloon. 80 // The currently-displayed icon for the notification balloon.
80 base::win::ScopedHICON balloon_icon_; 81 base::win::ScopedHICON balloon_icon_;
81 82
82 // Not owned. 83 // Not owned.
83 ui::MenuModel* menu_model_; 84 ui::MenuModel* menu_model_;
84 85
85 // Context menu associated with this icon (if any). 86 // Context menu associated with this icon (if any).
86 scoped_ptr<views::MenuRunner> menu_runner_; 87 std::unique_ptr<views::MenuRunner> menu_runner_;
87 88
88 DISALLOW_COPY_AND_ASSIGN(StatusIconWin); 89 DISALLOW_COPY_AND_ASSIGN(StatusIconWin);
89 }; 90 };
90 91
91 #endif // CHROME_BROWSER_UI_VIEWS_STATUS_ICONS_STATUS_ICON_WIN_H_ 92 #endif // CHROME_BROWSER_UI_VIEWS_STATUS_ICONS_STATUS_ICON_WIN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698