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 "mojo/services/view_manager/root_view_manager.h" | 5 #include "mojo/services/view_manager/root_view_manager.h" |
6 | 6 |
7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
8 #include "mojo/aura/screen_mojo.h" | 8 #include "mojo/aura/screen_mojo.h" |
9 #include "mojo/aura/window_tree_host_mojo.h" | 9 #include "mojo/aura/window_tree_host_mojo.h" |
10 #include "mojo/public/cpp/application/connect.h" | 10 #include "mojo/public/cpp/application/connect.h" |
11 #include "mojo/public/interfaces/service_provider/service_provider.mojom.h" | |
12 #include "mojo/services/view_manager/root_node_manager.h" | 11 #include "mojo/services/view_manager/root_node_manager.h" |
| 12 #include "mojo/services/view_manager/root_view_manager_delegate.h" |
13 #include "ui/aura/client/default_capture_client.h" | 13 #include "ui/aura/client/default_capture_client.h" |
14 #include "ui/aura/client/window_tree_client.h" | 14 #include "ui/aura/client/window_tree_client.h" |
15 #include "ui/aura/window.h" | 15 #include "ui/aura/window.h" |
16 | 16 |
17 namespace mojo { | 17 namespace mojo { |
18 namespace view_manager { | 18 namespace view_manager { |
19 namespace service { | 19 namespace service { |
20 | 20 |
21 class WindowTreeClientImpl : public aura::client::WindowTreeClient { | 21 class WindowTreeClientImpl : public aura::client::WindowTreeClient { |
22 public: | 22 public: |
(...skipping 18 matching lines...) Expand all Loading... |
41 | 41 |
42 private: | 42 private: |
43 aura::Window* window_; | 43 aura::Window* window_; |
44 | 44 |
45 scoped_ptr<aura::client::DefaultCaptureClient> capture_client_; | 45 scoped_ptr<aura::client::DefaultCaptureClient> capture_client_; |
46 | 46 |
47 DISALLOW_COPY_AND_ASSIGN(WindowTreeClientImpl); | 47 DISALLOW_COPY_AND_ASSIGN(WindowTreeClientImpl); |
48 }; | 48 }; |
49 | 49 |
50 RootViewManager::RootViewManager(ServiceProvider* service_provider, | 50 RootViewManager::RootViewManager(ServiceProvider* service_provider, |
51 RootNodeManager* root_node) | 51 RootNodeManager* root_node, |
52 : service_provider_(service_provider), | 52 RootViewManagerDelegate* delegate) |
| 53 : delegate_(delegate), |
53 root_node_manager_(root_node), | 54 root_node_manager_(root_node), |
54 in_setup_(false) { | 55 in_setup_(false) { |
55 screen_.reset(ScreenMojo::Create()); | 56 screen_.reset(ScreenMojo::Create()); |
56 gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen_.get()); | 57 gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen_.get()); |
57 NativeViewportPtr viewport; | 58 NativeViewportPtr viewport; |
58 ConnectToService(service_provider, | 59 ConnectToService(service_provider, |
59 "mojo:mojo_native_viewport_service", | 60 "mojo:mojo_native_viewport_service", |
60 &viewport); | 61 &viewport); |
61 window_tree_host_.reset(new WindowTreeHostMojo( | 62 window_tree_host_.reset(new WindowTreeHostMojo( |
62 viewport.Pass(), | 63 viewport.Pass(), |
(...skipping 14 matching lines...) Expand all Loading... |
77 | 78 |
78 aura::Window* root = root_node_manager_->root()->window(); | 79 aura::Window* root = root_node_manager_->root()->window(); |
79 window_tree_host_->window()->AddChild(root); | 80 window_tree_host_->window()->AddChild(root); |
80 root->SetBounds(gfx::Rect(window_tree_host_->window()->bounds().size())); | 81 root->SetBounds(gfx::Rect(window_tree_host_->window()->bounds().size())); |
81 root_node_manager_->root()->window()->Show(); | 82 root_node_manager_->root()->window()->Show(); |
82 | 83 |
83 window_tree_client_.reset( | 84 window_tree_client_.reset( |
84 new WindowTreeClientImpl(window_tree_host_->window())); | 85 new WindowTreeClientImpl(window_tree_host_->window())); |
85 | 86 |
86 window_tree_host_->Show(); | 87 window_tree_host_->Show(); |
| 88 |
| 89 delegate_->OnRootViewManagerWindowTreeHostCreated(); |
87 } | 90 } |
88 | 91 |
89 } // namespace service | 92 } // namespace service |
90 } // namespace view_manager | 93 } // namespace view_manager |
91 } // namespace mojo | 94 } // namespace mojo |
OLD | NEW |