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

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

Issue 1752233002: Convert Pass()→std::move() on Windows (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 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 #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>
10
9 #include "base/bind.h" 11 #include "base/bind.h"
10 #include "base/location.h" 12 #include "base/location.h"
11 #include "base/macros.h" 13 #include "base/macros.h"
12 #include "base/single_thread_task_runner.h" 14 #include "base/single_thread_task_runner.h"
13 #include "base/threading/non_thread_safe.h" 15 #include "base/threading/non_thread_safe.h"
14 #include "base/threading/thread.h" 16 #include "base/threading/thread.h"
15 #include "base/win/wrapped_window_proc.h" 17 #include "base/win/wrapped_window_proc.h"
16 #include "chrome/browser/lifetime/application_lifetime.h" 18 #include "chrome/browser/lifetime/application_lifetime.h"
17 #include "chrome/browser/ui/views/status_icons/status_icon_win.h" 19 #include "chrome/browser/ui/views/status_icons/status_icon_win.h"
18 #include "chrome/browser/ui/views/status_icons/status_tray_state_changer_win.h" 20 #include "chrome/browser/ui/views/status_icons/status_tray_state_changer_win.h"
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 return icon; 225 return icon;
224 } 226 }
225 227
226 UINT StatusTrayWin::NextIconId() { 228 UINT StatusTrayWin::NextIconId() {
227 UINT icon_id = next_icon_id_++; 229 UINT icon_id = next_icon_id_++;
228 return kBaseIconId + static_cast<UINT>(NAMED_STATUS_ICON_COUNT) + icon_id; 230 return kBaseIconId + static_cast<UINT>(NAMED_STATUS_ICON_COUNT) + icon_id;
229 } 231 }
230 232
231 void StatusTrayWin::SetStatusTrayStateChangerProxyForTest( 233 void StatusTrayWin::SetStatusTrayStateChangerProxyForTest(
232 scoped_ptr<StatusTrayStateChangerProxy> proxy) { 234 scoped_ptr<StatusTrayStateChangerProxy> proxy) {
233 state_changer_proxy_ = proxy.Pass(); 235 state_changer_proxy_ = std::move(proxy);
234 } 236 }
235 237
236 StatusTray* StatusTray::Create() { 238 StatusTray* StatusTray::Create() {
237 return new StatusTrayWin(); 239 return new StatusTrayWin();
238 } 240 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698