ash/common/session/session_state_observer.cc - Issue 2761373002: Move yet more from WmShell to Shell

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ash/common/session/session_state_observer.cc

Issue 2761373002: Move yet more from WmShell to Shell (Closed)

Patch Set: merge Created 3 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:

« no previous file with comments | « ash/common/mojo_interface_factory.cc ('k') | ash/common/shelf/shelf_layout_manager.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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/common/session/session_state_observer.h"	5 #include "ash/common/session/session_state_observer.h"

6	6

7 #include "ash/common/session/session_controller.h"	7 #include "ash/common/session/session_controller.h"

8 #include "ash/common/wm_shell.h"	8 #include "ash/shell.h"

9	9

10 namespace ash {	10 namespace ash {

11	11

12 ScopedSessionStateObserver::ScopedSessionStateObserver(	12 ScopedSessionStateObserver::ScopedSessionStateObserver(

13 SessionStateObserver* observer)	13 SessionStateObserver* observer)

14 : observer_(observer) {	14 : observer_(observer) {

15 WmShell::Get()->session_controller()->AddSessionStateObserver(observer_);	15 Shell::Get()->session_controller()->AddSessionStateObserver(observer_);

16 }	16 }

17	17

18 ScopedSessionStateObserver::~ScopedSessionStateObserver() {	18 ScopedSessionStateObserver::~ScopedSessionStateObserver() {

19 if (WmShell::Get()) {	19 if (Shell::HasInstance())

20 WmShell::Get()->session_controller()->RemoveSessionStateObserver(observer_);	20 Shell::Get()->session_controller()->RemoveSessionStateObserver(observer_);

21 }

22 }	21 }

23	22

24 } // namespace ash	23 } // namespace ash

OLD	NEW