mash/example/common/mus_views_init.h - Issue 2119963002: Move mus to //services/ui

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: mash/example/common/mus_views_init.h

Issue 2119963002: Move mus to //services/ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: . 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 | « mash/catalog_viewer/BUILD.gn ('k') | mash/example/views_examples/BUILD.gn » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 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 #ifndef MASH_EXAMPLE_COMMON_MUS_VIEWS_INIT_H_	5 #ifndef MASH_EXAMPLE_COMMON_MUS_VIEWS_INIT_H_

6 #define MASH_EXAMPLE_COMMON_MUS_VIEWS_INIT_H_	6 #define MASH_EXAMPLE_COMMON_MUS_VIEWS_INIT_H_

7	7

8 #include <memory>	8 #include <memory>

9	9

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

11 #include "components/mus/public/cpp/window_tree_client_delegate.h"	11 #include "services/ui/public/cpp/window_tree_client_delegate.h"

12 #include "components/mus/public/interfaces/window_manager.mojom.h"	12 #include "services/ui/public/interfaces/window_manager.mojom.h"

13 #include "ui/views/mus/aura_init.h"	13 #include "ui/views/mus/aura_init.h"

14 #include "ui/views/views_delegate.h"	14 #include "ui/views/views_delegate.h"

15	15

16 namespace mojo {	16 namespace mojo {

17 class ShellConnection;	17 class ShellConnection;

18 }	18 }

19	19

20 namespace views {	20 namespace views {

21 class AuraInit;	21 class AuraInit;

22 }	22 }

(...skipping 23 matching lines...) Expand all Loading...
46 #endif	46 #endif

47	47

48 shell::ShellConnection* app_;	48 shell::ShellConnection* app_;

49 std::unique_ptr<views::AuraInit> aura_init_;	49 std::unique_ptr<views::AuraInit> aura_init_;

50 mus::mojom::WindowManagerPtr window_manager_;	50 mus::mojom::WindowManagerPtr window_manager_;

51	51

52 DISALLOW_COPY_AND_ASSIGN(MUSViewsInit);	52 DISALLOW_COPY_AND_ASSIGN(MUSViewsInit);

53 };	53 };

54	54

55 #endif // MASH_EXAMPLE_COMMON_MUS_VIEWS_INIT_H_	55 #endif // MASH_EXAMPLE_COMMON_MUS_VIEWS_INIT_H_

OLD	NEW