ash/shelf/shelf_locking_manager.cc - Issue 2041233004: mash: Move //ash/session to //ash/common/session

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/shelf/shelf_locking_manager.cc

Issue 2041233004: mash: Move //ash/session to //ash/common/session (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 years, 6 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/shelf/shelf_locking_manager.h ('k') | ash/shelf/shelf_locking_manager_unittest.cc » ('j') | no next file with comments »

OLD	NEW
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/shelf/shelf_locking_manager.h"	5 #include "ash/shelf/shelf_locking_manager.h"

6	6

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

8 #include "ash/shelf/shelf.h"	8 #include "ash/shelf/shelf.h"

9 #include "ash/shell.h"	9 #include "ash/shell.h"

10 #include "ash/wm/lock_state_controller.h"	10 #include "ash/wm/lock_state_controller.h"

11	11

12 namespace ash {	12 namespace ash {

13	13

14 ShelfLockingManager::ShelfLockingManager(Shelf* shelf) : shelf_(shelf) {	14 ShelfLockingManager::ShelfLockingManager(Shelf* shelf) : shelf_(shelf) {

15 Shell* shell = Shell::GetInstance();	15 Shell* shell = Shell::GetInstance();

16 shell->lock_state_controller()->AddObserver(this);	16 shell->lock_state_controller()->AddObserver(this);

17 SessionStateDelegate* delegate = shell->session_state_delegate();	17 SessionStateDelegate* delegate = shell->session_state_delegate();

(...skipping 32 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
50 const ShelfAlignment alignment = shelf_->alignment();	50 const ShelfAlignment alignment = shelf_->alignment();

51 if (is_locked() && alignment != SHELF_ALIGNMENT_BOTTOM_LOCKED) {	51 if (is_locked() && alignment != SHELF_ALIGNMENT_BOTTOM_LOCKED) {

52 stored_alignment_ = alignment;	52 stored_alignment_ = alignment;

53 shelf_->SetAlignment(SHELF_ALIGNMENT_BOTTOM_LOCKED);	53 shelf_->SetAlignment(SHELF_ALIGNMENT_BOTTOM_LOCKED);

54 } else if (!is_locked() && alignment == SHELF_ALIGNMENT_BOTTOM_LOCKED) {	54 } else if (!is_locked() && alignment == SHELF_ALIGNMENT_BOTTOM_LOCKED) {

55 shelf_->SetAlignment(stored_alignment_);	55 shelf_->SetAlignment(stored_alignment_);

56 }	56 }

57 }	57 }

58	58

59 } // namespace ash	59 } // namespace ash

OLD	NEW