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

Side by Side Diff: ash/mus/system_tray_delegate_mus.cc

Issue 2797743002: ash: Merge LoginStatus update code path (Closed)
Patch Set: for #2 comments Created 3 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
« no previous file with comments | « ash/common/test/test_session_controller_client.cc ('k') | ash/shell.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "ash/mus/system_tray_delegate_mus.h" 5 #include "ash/mus/system_tray_delegate_mus.h"
6 6
7 #include "ash/common/session/session_controller.h" 7 #include "ash/common/session/session_controller.h"
8 #include "ash/common/system/networking_config_delegate.h" 8 #include "ash/common/system/networking_config_delegate.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 10
(...skipping 19 matching lines...) Expand all
30 30
31 } // namespace 31 } // namespace
32 32
33 SystemTrayDelegateMus::SystemTrayDelegateMus() 33 SystemTrayDelegateMus::SystemTrayDelegateMus()
34 : networking_config_delegate_(new StubNetworkingConfigDelegate) {} 34 : networking_config_delegate_(new StubNetworkingConfigDelegate) {}
35 35
36 SystemTrayDelegateMus::~SystemTrayDelegateMus() { 36 SystemTrayDelegateMus::~SystemTrayDelegateMus() {
37 } 37 }
38 38
39 LoginStatus SystemTrayDelegateMus::GetUserLoginStatus() const { 39 LoginStatus SystemTrayDelegateMus::GetUserLoginStatus() const {
40 return Shell::Get()->session_controller()->GetLoginStatus(); 40 return Shell::Get()->session_controller()->login_status();
41 } 41 }
42 42
43 NetworkingConfigDelegate* SystemTrayDelegateMus::GetNetworkingConfigDelegate() 43 NetworkingConfigDelegate* SystemTrayDelegateMus::GetNetworkingConfigDelegate()
44 const { 44 const {
45 return networking_config_delegate_.get(); 45 return networking_config_delegate_.get();
46 } 46 }
47 47
48 } // namespace ash 48 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/test/test_session_controller_client.cc ('k') | ash/shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698