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

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

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 #include "chrome/browser/ui/views/status_icons/status_tray_win.h" 5 #include "chrome/browser/ui/views/status_icons/status_tray_win.h"
6 6
7 #include <commctrl.h> 7 #include <commctrl.h>
8 8
9 #include <utility> 9 #include <utility>
10 10
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 icon->SetToolTip(tool_tip); 224 icon->SetToolTip(tool_tip);
225 return icon; 225 return icon;
226 } 226 }
227 227
228 UINT StatusTrayWin::NextIconId() { 228 UINT StatusTrayWin::NextIconId() {
229 UINT icon_id = next_icon_id_++; 229 UINT icon_id = next_icon_id_++;
230 return kBaseIconId + static_cast<UINT>(NAMED_STATUS_ICON_COUNT) + icon_id; 230 return kBaseIconId + static_cast<UINT>(NAMED_STATUS_ICON_COUNT) + icon_id;
231 } 231 }
232 232
233 void StatusTrayWin::SetStatusTrayStateChangerProxyForTest( 233 void StatusTrayWin::SetStatusTrayStateChangerProxyForTest(
234 scoped_ptr<StatusTrayStateChangerProxy> proxy) { 234 std::unique_ptr<StatusTrayStateChangerProxy> proxy) {
235 state_changer_proxy_ = std::move(proxy); 235 state_changer_proxy_ = std::move(proxy);
236 } 236 }
237 237
238 StatusTray* StatusTray::Create() { 238 StatusTray* StatusTray::Create() {
239 return new StatusTrayWin(); 239 return new StatusTrayWin();
240 } 240 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698