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 <vector> | 5 #include <vector> |
6 | 6 |
7 #include "examples/wm_flow/wm/frame_controller.h" | 7 #include "examples/wm_flow/wm/frame_controller.h" |
8 #include "mojo/application/application_runner_chromium.h" | 8 #include "mojo/application/application_runner_chromium.h" |
9 #include "mojo/public/c/system/main.h" | 9 #include "mojo/public/c/system/main.h" |
10 #include "mojo/public/cpp/application/application_delegate.h" | 10 #include "mojo/public/cpp/application/application_delegate.h" |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
56 mojo::ViewManager* view_manager, | 56 mojo::ViewManager* view_manager, |
57 mojo::View* root, | 57 mojo::View* root, |
58 mojo::ServiceProviderImpl* exported_services, | 58 mojo::ServiceProviderImpl* exported_services, |
59 scoped_ptr<mojo::ServiceProvider> remote_service_provider) override { | 59 scoped_ptr<mojo::ServiceProvider> remote_service_provider) override { |
60 view_manager_ = view_manager; | 60 view_manager_ = view_manager; |
61 root_ = root; | 61 root_ = root; |
62 | 62 |
63 window_container_ = mojo::View::Create(view_manager_); | 63 window_container_ = mojo::View::Create(view_manager_); |
64 window_container_->SetBounds(root_->bounds()); | 64 window_container_->SetBounds(root_->bounds()); |
65 root_->AddChild(window_container_); | 65 root_->AddChild(window_container_); |
| 66 window_container_->SetVisible(true); |
66 | 67 |
67 window_manager_app_->InitFocus(scoped_ptr<mojo::FocusRules>( | 68 window_manager_app_->InitFocus(scoped_ptr<mojo::FocusRules>( |
68 new mojo::BasicFocusRules(window_container_))); | 69 new mojo::BasicFocusRules(window_container_))); |
69 } | 70 } |
70 virtual void OnViewManagerDisconnected( | 71 virtual void OnViewManagerDisconnected( |
71 mojo::ViewManager* view_manager) override { | 72 mojo::ViewManager* view_manager) override { |
72 view_manager_ = NULL; | 73 view_manager_ = NULL; |
73 root_ = NULL; | 74 root_ = NULL; |
74 } | 75 } |
75 | 76 |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
138 | 139 |
139 DISALLOW_COPY_AND_ASSIGN(SimpleWM); | 140 DISALLOW_COPY_AND_ASSIGN(SimpleWM); |
140 }; | 141 }; |
141 | 142 |
142 } // namespace examples | 143 } // namespace examples |
143 | 144 |
144 MojoResult MojoMain(MojoHandle shell_handle) { | 145 MojoResult MojoMain(MojoHandle shell_handle) { |
145 mojo::ApplicationRunnerChromium runner(new examples::SimpleWM); | 146 mojo::ApplicationRunnerChromium runner(new examples::SimpleWM); |
146 return runner.Run(shell_handle); | 147 return runner.Run(shell_handle); |
147 } | 148 } |
OLD | NEW |