components/view_manager/connection_manager.h - Issue 1131523007: Move NativeViewport service into view_manager. This is a file move only. Further merging will happe…

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: components/view_manager/connection_manager.h

Issue 1131523007: Move NativeViewport service into view_manager. This is a file move only. Further merging will happe… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: . Created 5 years, 7 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 | « components/view_manager/BUILD.gn ('k') | components/view_manager/display_manager.h » ('j') | no next file with comments »

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

6 #define COMPONENTS_VIEW_MANAGER_CONNECTION_MANAGER_H_	6 #define COMPONENTS_VIEW_MANAGER_CONNECTION_MANAGER_H_

7	7

8 #include <map>	8 #include <map>

9 #include <set>	9 #include <set>

10	10

11 #include "base/basictypes.h"	11 #include "base/basictypes.h"

12 #include "base/memory/scoped_ptr.h"	12 #include "base/memory/scoped_ptr.h"

13 #include "base/timer/timer.h"	13 #include "base/timer/timer.h"

14 #include "components/native_viewport/public/interfaces/native_viewport.mojom.h"

15 #include "components/view_manager/animation_runner.h"	14 #include "components/view_manager/animation_runner.h"

16 #include "components/view_manager/event_dispatcher.h"	15 #include "components/view_manager/event_dispatcher.h"

17 #include "components/view_manager/focus_controller_delegate.h"	16 #include "components/view_manager/focus_controller_delegate.h"

18 #include "components/view_manager/ids.h"	17 #include "components/view_manager/ids.h"

	18 #include "components/view_manager/public/interfaces/native_viewport.mojom.h"

19 #include "components/view_manager/public/interfaces/view_manager.mojom.h"	19 #include "components/view_manager/public/interfaces/view_manager.mojom.h"

20 #include "components/view_manager/public/interfaces/view_manager_root.mojom.h"	20 #include "components/view_manager/public/interfaces/view_manager_root.mojom.h"

21 #include "components/view_manager/server_view_delegate.h"	21 #include "components/view_manager/server_view_delegate.h"

22 #include "components/view_manager/server_view_observer.h"	22 #include "components/view_manager/server_view_observer.h"

23 #include "third_party/mojo/src/mojo/public/cpp/bindings/array.h"	23 #include "third_party/mojo/src/mojo/public/cpp/bindings/array.h"

24 #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"	24 #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"

25	25

26 namespace view_manager {	26 namespace view_manager {

27	27

28 class ClientConnection;	28 class ClientConnection;

(...skipping 243 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
272 scoped_ptr<FocusController> focus_controller_;	272 scoped_ptr<FocusController> focus_controller_;

273	273

274 mojo::ViewManagerRootClientPtr view_manager_root_client_;	274 mojo::ViewManagerRootClientPtr view_manager_root_client_;

275	275

276 DISALLOW_COPY_AND_ASSIGN(ConnectionManager);	276 DISALLOW_COPY_AND_ASSIGN(ConnectionManager);

277 };	277 };

278	278

279 } // namespace view_manager	279 } // namespace view_manager

280	280

281 #endif // COMPONENTS_VIEW_MANAGER_CONNECTION_MANAGER_H_	281 #endif // COMPONENTS_VIEW_MANAGER_CONNECTION_MANAGER_H_

OLD	NEW