mojo/examples/window_manager/window_manager.cc - Issue 640893003: Move mojo/services/public/cpp TypeConverters to mojo/converters.

Side by Side Diff: mojo/examples/window_manager/window_manager.cc

Issue 640893003: Move mojo/services/public/cpp TypeConverters to mojo/converters. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Restore the directory and component structures and target names. Created 6 years, 2 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 | « mojo/examples/window_manager/BUILD.gn ('k') | mojo/mojo.gyp » ('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 #include "base/bind.h"	5 #include "base/bind.h"

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

7 #include "mojo/application/application_runner_chromium.h"	7 #include "mojo/application/application_runner_chromium.h"

	8 #include "mojo/converters/geometry/geometry_type_converters.h"

	9 #include "mojo/converters/input_events/input_events_type_converters.h"

8 #include "mojo/examples/keyboard/keyboard.mojom.h"	10 #include "mojo/examples/keyboard/keyboard.mojom.h"

9 #include "mojo/examples/window_manager/debug_panel.h"	11 #include "mojo/examples/window_manager/debug_panel.h"

10 #include "mojo/examples/window_manager/window_manager.mojom.h"	12 #include "mojo/examples/window_manager/window_manager.mojom.h"

11 #include "mojo/public/c/system/main.h"	13 #include "mojo/public/c/system/main.h"

12 #include "mojo/public/cpp/application/application_connection.h"	14 #include "mojo/public/cpp/application/application_connection.h"

13 #include "mojo/public/cpp/application/application_delegate.h"	15 #include "mojo/public/cpp/application/application_delegate.h"

14 #include "mojo/public/cpp/application/application_impl.h"	16 #include "mojo/public/cpp/application/application_impl.h"

15 #include "mojo/public/cpp/application/interface_factory_impl.h"	17 #include "mojo/public/cpp/application/interface_factory_impl.h"

16 #include "mojo/public/cpp/application/service_provider_impl.h"	18 #include "mojo/public/cpp/application/service_provider_impl.h"

17 #include "mojo/services/public/cpp/geometry/geometry_type_converters.h"

18 #include "mojo/services/public/cpp/input_events/input_events_type_converters.h"

19 #include "mojo/services/public/cpp/view_manager/view.h"	19 #include "mojo/services/public/cpp/view_manager/view.h"

20 #include "mojo/services/public/cpp/view_manager/view_manager.h"	20 #include "mojo/services/public/cpp/view_manager/view_manager.h"

21 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h"	21 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h"

22 #include "mojo/services/public/cpp/view_manager/view_observer.h"	22 #include "mojo/services/public/cpp/view_manager/view_observer.h"

23 #include "mojo/services/public/cpp/view_manager/window_manager_delegate.h"	23 #include "mojo/services/public/cpp/view_manager/window_manager_delegate.h"

24 #include "mojo/services/public/interfaces/input_events/input_events.mojom.h"	24 #include "mojo/services/public/interfaces/input_events/input_events.mojom.h"

25 #include "mojo/services/public/interfaces/navigation/navigation.mojom.h"	25 #include "mojo/services/public/interfaces/navigation/navigation.mojom.h"

26 #include "mojo/services/window_manager/window_manager_app.h"	26 #include "mojo/services/window_manager/window_manager_app.h"

27 #include "mojo/views/views_init.h"	27 #include "mojo/views/views_init.h"

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

(...skipping 589 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
618 window_manager_->RequestNavigate(view_id_, target, request.Pass());	618 window_manager_->RequestNavigate(view_id_, target, request.Pass());

619 }	619 }

620	620

621 } // namespace examples	621 } // namespace examples

622 } // namespace mojo	622 } // namespace mojo

623	623

624 MojoResult MojoMain(MojoHandle shell_handle) {	624 MojoResult MojoMain(MojoHandle shell_handle) {

625 mojo::ApplicationRunnerChromium runner(new mojo::examples::WindowManager);	625 mojo::ApplicationRunnerChromium runner(new mojo::examples::WindowManager);

626 return runner.Run(shell_handle);	626 return runner.Run(shell_handle);

627 }	627 }

OLD	NEW