ash/mus/bridge/wm_shelf_mus.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/mus/bridge/wm_shelf_mus.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 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/bridge/wm_shelf_mus.h"	5 #include "ash/mus/bridge/wm_shelf_mus.h"

6	6

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

7 #include "ash/common/shelf/shelf_delegate.h"	8 #include "ash/common/shelf/shelf_delegate.h"

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

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

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

10 #include "ash/common/wm_shell.h"	12 #include "ash/common/wm_shell.h"

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

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

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

14	14

15 namespace ash {	15 namespace ash {

16 namespace mus {	16 namespace mus {

17	17

18 WmShelfMus::WmShelfMus(WmRootWindowController* root_window_controller) {	18 WmShelfMus::WmShelfMus(WmRootWindowController* root_window_controller) {

19 DCHECK(root_window_controller);	19 DCHECK(root_window_controller);

20 WmShell::Get()->CreateShelfDelegate();	20 WmShell::Get()->CreateShelfDelegate();

21 WmWindow* root = root_window_controller->GetWindow();	21 WmWindow* root = root_window_controller->GetWindow();

22 shelf_widget_.reset(new ShelfWidget(	22 shelf_widget_.reset(new ShelfWidget(

23 root->GetChildByShellWindowId(kShellWindowId_ShelfContainer),	23 root->GetChildByShellWindowId(kShellWindowId_ShelfContainer),

(...skipping 14 matching lines...) Expand all Loading...
38 WmShelf::ClearShelf();	38 WmShelf::ClearShelf();

39 }	39 }

40	40

41 void WmShelfMus::WillDeleteShelfLayoutManager() {	41 void WmShelfMus::WillDeleteShelfLayoutManager() {

42 shelf_widget_->Shutdown();	42 shelf_widget_->Shutdown();

43 WmShelf::WillDeleteShelfLayoutManager();	43 WmShelf::WillDeleteShelfLayoutManager();

44 }	44 }

45	45

46 } // namespace mus	46 } // namespace mus

47 } // namespace ash	47 } // namespace ash

OLD	NEW

« no previous file with comments | « ash/mus/bridge/DEPS ('k') | ash/root_window_controller.cc » ('j') | no next file with comments »