ash/common/system/status_area_layout_manager.cc - Issue 2268823002: mash: Move more shelf files to ash/common/shelf.

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/system/status_area_layout_manager.cc

Issue 2268823002: mash: Move more shelf files to ash/common/shelf. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix rebase. Created 4 years, 4 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

OLD	NEW
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 "ash/wm/status_area_layout_manager.h"	5 #include "ash/common/system/status_area_layout_manager.h"

6	6

	7 #include "ash/common/shelf/shelf_layout_manager.h"

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

7 #include "ash/common/system/status_area_widget.h"	9 #include "ash/common/system/status_area_widget.h"

8 #include "ash/common/wm_lookup.h"	10 #include "ash/common/wm_lookup.h"

9 #include "ash/common/wm_window.h"	11 #include "ash/common/wm_window.h"

10 #include "ash/shelf/shelf_layout_manager.h"

11 #include "ash/shelf/shelf_widget.h"

12 #include "base/auto_reset.h"	12 #include "base/auto_reset.h"

13	13

14 namespace ash {	14 namespace ash {

15	15

16 ////////////////////////////////////////////////////////////////////////////////	16 ////////////////////////////////////////////////////////////////////////////////

17 // StatusAreaLayoutManager, public:	17 // StatusAreaLayoutManager, public:

18	18

19 StatusAreaLayoutManager::StatusAreaLayoutManager(ShelfWidget* shelf_widget)	19 StatusAreaLayoutManager::StatusAreaLayoutManager(ShelfWidget* shelf_widget)

20 : in_layout_(false), shelf_widget_(shelf_widget) {}	20 : in_layout_(false), shelf_widget_(shelf_widget) {}

21	21

(...skipping 34 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
56 void StatusAreaLayoutManager::LayoutStatusArea() {	56 void StatusAreaLayoutManager::LayoutStatusArea() {

57 // Shelf layout manager may be already doing layout.	57 // Shelf layout manager may be already doing layout.

58 if (shelf_widget_->shelf_layout_manager()->updating_bounds())	58 if (shelf_widget_->shelf_layout_manager()->updating_bounds())

59 return;	59 return;

60	60

61 base::AutoReset<bool> auto_reset_in_layout(&in_layout_, true);	61 base::AutoReset<bool> auto_reset_in_layout(&in_layout_, true);

62 shelf_widget_->shelf_layout_manager()->LayoutShelf();	62 shelf_widget_->shelf_layout_manager()->LayoutShelf();

63 }	63 }

64	64

65 } // namespace ash	65 } // namespace ash

OLD	NEW