ash/wm/status_area_layout_manager.cc - Issue 2148593004: mash: Move StatusTray and StatusAreaWidget to //ash/common

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

Issue 2148593004: mash: Move StatusTray and StatusAreaWidget to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@traydisplay

Patch Set: rebase Created 4 years, 5 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/wm/gestures/shelf_gesture_handler.cc ('k') | ash/wm/workspace_controller_unittest.cc » ('j') | no next file with comments »

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/wm/status_area_layout_manager.h"

6	6

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

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

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

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

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

11 #include "ui/aura/window.h"	11 #include "ui/aura/window.h"

12 #include "ui/views/widget/widget.h"	12 #include "ui/views/widget/widget.h"

13	13

14 namespace ash {	14 namespace ash {

15	15

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

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

18	18

19 StatusAreaLayoutManager::StatusAreaLayoutManager(aura::Window* container,	19 StatusAreaLayoutManager::StatusAreaLayoutManager(aura::Window* container,

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

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

56 if (shelf_->shelf_layout_manager()->updating_bounds())	56 if (shelf_->shelf_layout_manager()->updating_bounds())

57 return;	57 return;

58	58

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

60 shelf_->shelf_layout_manager()->LayoutShelf();	60 shelf_->shelf_layout_manager()->LayoutShelf();

61 }	61 }

62	62

63 } // namespace ash	63 } // namespace ash

OLD	NEW