Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(370)

Side by Side Diff: components/window_manager/main.cc

Issue 1085233004: Moves services implementations out of third_party/mojo_services (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: unnecessary changes Created 5 years, 8 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
OLDNEW
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/memory/scoped_ptr.h" 5 #include "base/memory/scoped_ptr.h"
6 #include "components/view_manager/public/cpp/view_manager.h"
7 #include "components/view_manager/public/cpp/view_manager_delegate.h"
6 #include "components/window_manager/basic_focus_rules.h" 8 #include "components/window_manager/basic_focus_rules.h"
7 #include "components/window_manager/window_manager_app.h" 9 #include "components/window_manager/window_manager_app.h"
8 #include "components/window_manager/window_manager_delegate.h" 10 #include "components/window_manager/window_manager_delegate.h"
9 #include "mojo/application/application_runner_chromium.h" 11 #include "mojo/application/application_runner_chromium.h"
10 #include "mojo/common/tracing_impl.h" 12 #include "mojo/common/tracing_impl.h"
11 #include "third_party/mojo/src/mojo/public/c/system/main.h" 13 #include "third_party/mojo/src/mojo/public/c/system/main.h"
12 #include "third_party/mojo/src/mojo/public/cpp/application/application_delegate. h" 14 #include "third_party/mojo/src/mojo/public/cpp/application/application_delegate. h"
13 #include "third_party/mojo/src/mojo/public/cpp/application/service_provider_impl .h" 15 #include "third_party/mojo/src/mojo/public/cpp/application/service_provider_impl .h"
14 #include "third_party/mojo_services/src/view_manager/public/cpp/view_manager.h"
15 #include "third_party/mojo_services/src/view_manager/public/cpp/view_manager_del egate.h"
16 16
17 // ApplicationDelegate implementation file for WindowManager users (e.g. 17 // ApplicationDelegate implementation file for WindowManager users (e.g.
18 // core window manager tests) that do not want to provide their own 18 // core window manager tests) that do not want to provide their own
19 // ApplicationDelegate::Create(). 19 // ApplicationDelegate::Create().
20 20
21 using mojo::View; 21 using mojo::View;
22 using mojo::ViewManager; 22 using mojo::ViewManager;
23 23
24 namespace window_manager { 24 namespace window_manager {
25 25
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 MOJO_DISALLOW_COPY_AND_ASSIGN(DefaultWindowManager); 83 MOJO_DISALLOW_COPY_AND_ASSIGN(DefaultWindowManager);
84 }; 84 };
85 85
86 } // namespace window_manager 86 } // namespace window_manager
87 87
88 MojoResult MojoMain(MojoHandle shell_handle) { 88 MojoResult MojoMain(MojoHandle shell_handle) {
89 mojo::ApplicationRunnerChromium runner( 89 mojo::ApplicationRunnerChromium runner(
90 new window_manager::DefaultWindowManager); 90 new window_manager::DefaultWindowManager);
91 return runner.Run(shell_handle); 91 return runner.Run(shell_handle);
92 } 92 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698