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

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

Issue 788453002: Put code in //services/window_manager in namespace window_manager (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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 "mojo/application/application_runner_chromium.h" 6 #include "mojo/application/application_runner_chromium.h"
7 #include "mojo/common/tracing_impl.h" 7 #include "mojo/common/tracing_impl.h"
8 #include "mojo/public/c/system/main.h" 8 #include "mojo/public/c/system/main.h"
9 #include "mojo/public/cpp/application/application_delegate.h" 9 #include "mojo/public/cpp/application/application_delegate.h"
10 #include "mojo/public/cpp/application/service_provider_impl.h" 10 #include "mojo/public/cpp/application/service_provider_impl.h"
11 #include "mojo/services/public/cpp/view_manager/view_manager.h" 11 #include "mojo/services/public/cpp/view_manager/view_manager.h"
12 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h" 12 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h"
13 #include "services/window_manager/window_manager_app.h" 13 #include "services/window_manager/window_manager_app.h"
14 #include "services/window_manager/window_manager_delegate.h" 14 #include "services/window_manager/window_manager_delegate.h"
15 15
16 // ApplicationDelegate implementation file for WindowManager users (e.g. 16 // ApplicationDelegate implementation file for WindowManager users (e.g.
17 // core window manager tests) that do not want to provide their own 17 // core window manager tests) that do not want to provide their own
18 // ApplicationDelegate::Create(). 18 // ApplicationDelegate::Create().
19 19
20 namespace mojo { 20 using mojo::View;
21 using mojo::ViewManager;
21 22
22 class DefaultWindowManager : public ApplicationDelegate, 23 namespace window_manager {
23 public ViewManagerDelegate, 24
25 class DefaultWindowManager : public mojo::ApplicationDelegate,
26 public mojo::ViewManagerDelegate,
24 public WindowManagerDelegate { 27 public WindowManagerDelegate {
25 public: 28 public:
26 DefaultWindowManager() 29 DefaultWindowManager()
27 : window_manager_app_(new WindowManagerApp(this, this)), 30 : window_manager_app_(new WindowManagerApp(this, this)),
28 view_manager_(NULL), 31 view_manager_(NULL),
29 root_(NULL) {} 32 root_(NULL) {}
30 ~DefaultWindowManager() override {} 33 ~DefaultWindowManager() override {}
31 34
32 private: 35 private:
33 // Overridden from ApplicationDelegate: 36 // Overridden from mojo::ApplicationDelegate:
34 void Initialize(ApplicationImpl* impl) override { 37 void Initialize(mojo::ApplicationImpl* impl) override {
35 window_manager_app_->Initialize(impl); 38 window_manager_app_->Initialize(impl);
36 TracingImpl::Create(impl); 39 mojo::TracingImpl::Create(impl);
37 } 40 }
38 bool ConfigureIncomingConnection(ApplicationConnection* connection) override { 41 bool ConfigureIncomingConnection(
42 mojo::ApplicationConnection* connection) override {
39 window_manager_app_->ConfigureIncomingConnection(connection); 43 window_manager_app_->ConfigureIncomingConnection(connection);
40 return true; 44 return true;
41 } 45 }
42 46
43 // Overridden from ViewManagerDelegate: 47 // Overridden from ViewManagerDelegate:
44 void OnEmbed(ViewManager* view_manager, 48 void OnEmbed(ViewManager* view_manager,
45 View* root, 49 View* root,
46 ServiceProviderImpl* exported_services, 50 mojo::ServiceProviderImpl* exported_services,
47 scoped_ptr<ServiceProvider> imported_services) override { 51 scoped_ptr<mojo::ServiceProvider> imported_services) override {
48 view_manager_ = view_manager; 52 view_manager_ = view_manager;
49 root_ = root; 53 root_ = root;
50 } 54 }
51 void OnViewManagerDisconnected(ViewManager* view_manager) override {} 55 void OnViewManagerDisconnected(ViewManager* view_manager) override {}
52 56
53 // Overridden from WindowManagerDelegate: 57 // Overridden from WindowManagerDelegate:
54 void Embed(const String& url, 58 void Embed(
55 InterfaceRequest<ServiceProvider> service_provider) override { 59 const mojo::String& url,
60 mojo::InterfaceRequest<mojo::ServiceProvider> service_provider) override {
56 View* view = View::Create(view_manager_); 61 View* view = View::Create(view_manager_);
57 root_->AddChild(view); 62 root_->AddChild(view);
58 view->SetVisible(true); 63 view->SetVisible(true);
59 view->Embed(url, scoped_ptr<mojo::ServiceProviderImpl>( 64 view->Embed(url, scoped_ptr<mojo::ServiceProviderImpl>(
60 new mojo::ServiceProviderImpl).Pass()); 65 new mojo::ServiceProviderImpl).Pass());
61 } 66 }
62 67
63 scoped_ptr<WindowManagerApp> window_manager_app_; 68 scoped_ptr<WindowManagerApp> window_manager_app_;
64 69
65 ViewManager* view_manager_; 70 ViewManager* view_manager_;
66 View* root_; 71 View* root_;
67 72
68 MOJO_DISALLOW_COPY_AND_ASSIGN(DefaultWindowManager); 73 MOJO_DISALLOW_COPY_AND_ASSIGN(DefaultWindowManager);
69 }; 74 };
70 75
71 } // namespace mojo 76 } // namespace window_manager
72 77
73 MojoResult MojoMain(MojoHandle shell_handle) { 78 MojoResult MojoMain(MojoHandle shell_handle) {
74 mojo::ApplicationRunnerChromium runner(new mojo::DefaultWindowManager); 79 mojo::ApplicationRunnerChromium runner(
80 new window_manager::DefaultWindowManager);
75 return runner.Run(shell_handle); 81 return runner.Run(shell_handle);
76 } 82 }
OLDNEW
« no previous file with comments | « services/window_manager/focus_rules.h ('k') | services/window_manager/native_viewport_event_dispatcher_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698