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/basictypes.h" | 5 #include "base/basictypes.h" |
6 #include "base/bind.h" | 6 #include "base/bind.h" |
7 #include "base/strings/stringprintf.h" | |
7 #include "mojo/examples/window_manager/window_manager.mojom.h" | 8 #include "mojo/examples/window_manager/window_manager.mojom.h" |
8 #include "mojo/public/cpp/application/application.h" | 9 #include "mojo/public/cpp/application/application.h" |
10 #include "mojo/services/navigation/navigation.mojom.h" | |
9 #include "mojo/services/public/cpp/view_manager/view.h" | 11 #include "mojo/services/public/cpp/view_manager/view.h" |
10 #include "mojo/services/public/cpp/view_manager/view_manager.h" | 12 #include "mojo/services/public/cpp/view_manager/view_manager.h" |
11 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h" | 13 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h" |
12 #include "mojo/services/public/cpp/view_manager/view_observer.h" | 14 #include "mojo/services/public/cpp/view_manager/view_observer.h" |
13 #include "mojo/services/public/cpp/view_manager/view_tree_node.h" | 15 #include "mojo/services/public/cpp/view_manager/view_tree_node.h" |
14 #include "ui/events/event_constants.h" | 16 #include "ui/events/event_constants.h" |
15 | 17 |
16 #if defined CreateWindow | 18 #if defined CreateWindow |
17 #undef CreateWindow | 19 #undef CreateWindow |
18 #endif | 20 #endif |
19 | 21 |
20 using mojo::view_manager::Id; | 22 using mojo::view_manager::Id; |
21 using mojo::view_manager::View; | 23 using mojo::view_manager::View; |
22 using mojo::view_manager::ViewManager; | 24 using mojo::view_manager::ViewManager; |
23 using mojo::view_manager::ViewManagerDelegate; | 25 using mojo::view_manager::ViewManagerDelegate; |
24 using mojo::view_manager::ViewObserver; | 26 using mojo::view_manager::ViewObserver; |
25 using mojo::view_manager::ViewTreeNode; | 27 using mojo::view_manager::ViewTreeNode; |
26 using mojo::view_manager::ViewTreeNodeObserver; | 28 using mojo::view_manager::ViewTreeNodeObserver; |
27 | 29 |
28 namespace mojo { | 30 namespace mojo { |
29 namespace examples { | 31 namespace examples { |
30 | 32 |
31 class WindowManager; | 33 class WindowManager; |
32 | 34 |
35 namespace { | |
36 | |
37 const SkColor kColors[] = { SK_ColorYELLOW, | |
38 SK_ColorRED, | |
39 SK_ColorGREEN, | |
40 SK_ColorMAGENTA }; | |
41 | |
42 const char kEmbeddedAppURL[] = "mojo:mojo_embedded_app"; | |
43 | |
44 } // namespace | |
45 | |
33 class WindowManagerConnection : public InterfaceImpl<IWindowManager> { | 46 class WindowManagerConnection : public InterfaceImpl<IWindowManager> { |
34 public: | 47 public: |
35 explicit WindowManagerConnection(WindowManager* window_manager) | 48 explicit WindowManagerConnection(WindowManager* window_manager) |
36 : window_manager_(window_manager) {} | 49 : window_manager_(window_manager) {} |
37 virtual ~WindowManagerConnection() {} | 50 virtual ~WindowManagerConnection() {} |
38 | 51 |
39 private: | 52 private: |
40 // Overridden from IWindowManager: | 53 // Overridden from IWindowManager: |
41 virtual void CloseWindow(Id node_id) OVERRIDE; | 54 virtual void CloseWindow(Id node_id) OVERRIDE; |
42 | 55 |
(...skipping 19 matching lines...) Expand all Loading... | |
62 // Overridden from Application: | 75 // Overridden from Application: |
63 virtual void Initialize() MOJO_OVERRIDE { | 76 virtual void Initialize() MOJO_OVERRIDE { |
64 AddService<WindowManagerConnection>(this); | 77 AddService<WindowManagerConnection>(this); |
65 ViewManager::Create(this, this); | 78 ViewManager::Create(this, this); |
66 } | 79 } |
67 | 80 |
68 // Overridden from ViewObserver: | 81 // Overridden from ViewObserver: |
69 virtual void OnViewInputEvent(View* view, const EventPtr& event) OVERRIDE { | 82 virtual void OnViewInputEvent(View* view, const EventPtr& event) OVERRIDE { |
70 if (event->action == ui::ET_MOUSE_RELEASED) { | 83 if (event->action == ui::ET_MOUSE_RELEASED) { |
71 if (event->flags & ui::EF_LEFT_MOUSE_BUTTON) | 84 if (event->flags & ui::EF_LEFT_MOUSE_BUTTON) |
72 CreateWindow("mojo:mojo_embedded_app"); | 85 CreateWindow(kEmbeddedAppURL); |
73 else if (event->flags & ui::EF_RIGHT_MOUSE_BUTTON) | 86 else if (event->flags & ui::EF_RIGHT_MOUSE_BUTTON) |
74 CreateWindow("mojo:mojo_nesting_app"); | 87 CreateWindow("mojo:mojo_nesting_app"); |
75 else if (event->flags & ui::EF_MIDDLE_MOUSE_BUTTON) | 88 else if (event->flags & ui::EF_MIDDLE_MOUSE_BUTTON) |
76 CreateWindow("mojo:mojo_browser"); | 89 CreateWindow("mojo:mojo_browser"); |
77 } | 90 } |
78 } | 91 } |
79 | 92 |
80 // Overridden from ViewManagerDelegate: | 93 // Overridden from ViewManagerDelegate: |
81 virtual void OnRootAdded(ViewManager* view_manager, | 94 virtual void OnRootAdded(ViewManager* view_manager, |
82 ViewTreeNode* root) OVERRIDE { | 95 ViewTreeNode* root) OVERRIDE { |
83 DCHECK(!view_manager_); | 96 DCHECK(!view_manager_); |
84 view_manager_ = view_manager; | 97 view_manager_ = view_manager; |
85 | 98 |
86 ViewTreeNode* node = ViewTreeNode::Create(view_manager); | 99 ViewTreeNode* node = ViewTreeNode::Create(view_manager); |
87 view_manager->GetRoots().front()->AddChild(node); | 100 view_manager->GetRoots().front()->AddChild(node); |
88 node->SetBounds(gfx::Rect(800, 600)); | 101 node->SetBounds(gfx::Rect(800, 600)); |
89 parent_node_id_ = node->id(); | 102 parent_node_id_ = node->id(); |
90 | 103 |
91 View* view = View::Create(view_manager); | 104 View* view = View::Create(view_manager); |
92 node->SetActiveView(view); | 105 node->SetActiveView(view); |
93 view->SetColor(SK_ColorBLUE); | 106 view->SetColor(SK_ColorBLUE); |
94 view->AddObserver(this); | 107 view->AddObserver(this); |
95 } | 108 } |
96 | 109 |
97 void CreateWindow(const String& url) { | 110 void CreateWindow(const std::string& url) { |
98 ViewTreeNode* node = view_manager_->GetNodeById(parent_node_id_); | 111 ViewTreeNode* node = view_manager_->GetNodeById(parent_node_id_); |
99 | 112 |
100 gfx::Rect bounds(50, 50, 200, 200); | 113 gfx::Rect bounds(50, 50, 200, 200); |
101 if (!node->children().empty()) { | 114 if (!node->children().empty()) { |
102 gfx::Point position = node->children().back()->bounds().origin(); | 115 gfx::Point position = node->children().back()->bounds().origin(); |
103 position.Offset(50, 50); | 116 position.Offset(50, 50); |
104 bounds.set_origin(position); | 117 bounds.set_origin(position); |
105 } | 118 } |
106 | 119 |
107 ViewTreeNode* embedded = ViewTreeNode::Create(view_manager_); | 120 ViewTreeNode* embedded = ViewTreeNode::Create(view_manager_); |
108 node->AddChild(embedded); | 121 node->AddChild(embedded); |
109 embedded->SetBounds(bounds); | 122 embedded->SetBounds(bounds); |
110 embedded->Embed(url); | 123 embedded->Embed(url); |
124 | |
125 // TODO(aa): This means that there can only ever be one instance of every | |
126 // app, which seems wrong. Instead, perhaps embedder should get back a | |
127 // service provider that allows it to talk to embeddee. | |
128 navigation::ViewNavigatorPtr view_navigator; | |
129 ConnectTo(url, &view_navigator); | |
sky
2014/06/10 22:15:14
This won't work for mojo_browser (line 89 above).
Aaron Boodman
2014/06/10 22:31:31
Sorry, didn't see that get added. Fixed.
| |
130 | |
131 navigation::NavigationDetailsPtr details( | |
132 navigation::NavigationDetails::New()); | |
133 size_t index = node->children().size() - 1; | |
134 details->url = base::StringPrintf( | |
135 "%s/%x", kEmbeddedAppURL, kColors[index % arraysize(kColors)]); | |
136 view_navigator->Navigate(embedded->id(), details.Pass()); | |
111 } | 137 } |
112 | 138 |
113 ViewManager* view_manager_; | 139 ViewManager* view_manager_; |
114 Id parent_node_id_; | 140 Id parent_node_id_; |
115 | 141 |
116 DISALLOW_COPY_AND_ASSIGN(WindowManager); | 142 DISALLOW_COPY_AND_ASSIGN(WindowManager); |
117 }; | 143 }; |
118 | 144 |
119 void WindowManagerConnection::CloseWindow(Id node_id) { | 145 void WindowManagerConnection::CloseWindow(Id node_id) { |
120 window_manager_->CloseWindow(node_id); | 146 window_manager_->CloseWindow(node_id); |
121 } | 147 } |
122 | 148 |
123 } // namespace examples | 149 } // namespace examples |
124 | 150 |
125 // static | 151 // static |
126 Application* Application::Create() { | 152 Application* Application::Create() { |
127 return new examples::WindowManager; | 153 return new examples::WindowManager; |
128 } | 154 } |
129 | 155 |
130 } // namespace mojo | 156 } // namespace mojo |
OLD | NEW |