ui/views/mus/screen_mus.h - Issue 1797153002: Reinstate wait-for-Initialize when Chrome is run in Mash

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: ui/views/mus/screen_mus.h

Issue 1797153002: Reinstate wait-for-Initialize when Chrome is run in Mash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@shell-client

Patch Set: fix views_mus_unittests too Created 4 years, 9 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 | « ui/views/mus/platform_test_helper_mus.cc ('k') | ui/views/mus/screen_mus.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 #ifndef UI_VIEWS_MUS_SCREEN_MUS_H_	5 #ifndef UI_VIEWS_MUS_SCREEN_MUS_H_

6 #define UI_VIEWS_MUS_SCREEN_MUS_H_	6 #define UI_VIEWS_MUS_SCREEN_MUS_H_

7	7

8 #include <vector>	8 #include <vector>

9	9

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

(...skipping 48 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
59 void OnDisplaysChanged(mojo::Array<mus::mojom::DisplayPtr> display) override;	59 void OnDisplaysChanged(mojo::Array<mus::mojom::DisplayPtr> display) override;

60 void OnDisplayRemoved(int64_t id) override;	60 void OnDisplayRemoved(int64_t id) override;

61	61

62 ScreenMusDelegate* delegate_;	62 ScreenMusDelegate* delegate_;

63 mus::mojom::DisplayManagerPtr display_manager_;	63 mus::mojom::DisplayManagerPtr display_manager_;

64 std::vector<gfx::Display> displays_;	64 std::vector<gfx::Display> displays_;

65 int primary_display_index_;	65 int primary_display_index_;

66 mojo::Binding<mus::mojom::DisplayManagerObserver>	66 mojo::Binding<mus::mojom::DisplayManagerObserver>

67 display_manager_observer_binding_;	67 display_manager_observer_binding_;

68 base::ObserverList<gfx::DisplayObserver> observers_;	68 base::ObserverList<gfx::DisplayObserver> observers_;

69 scoped_ptr<base::RunLoop> wait_for_displays_loop_;

70	69

71 DISALLOW_COPY_AND_ASSIGN(ScreenMus);	70 DISALLOW_COPY_AND_ASSIGN(ScreenMus);

72 };	71 };

73	72

74 } // namespace views	73 } // namespace views

75	74

76 #endif // UI_VIEWS_MUS_SCREEN_MUS_H_	75 #endif // UI_VIEWS_MUS_SCREEN_MUS_H_

OLD	NEW