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

Side by Side Diff: mojo/examples/embedded_app/embedded_app.cc

Issue 489493004: Update view manager to support content handling. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: png viewer works sorta Created 6 years, 4 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 | Annotate | Revision Log
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/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/bind.h" 6 #include "base/bind.h"
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "base/strings/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
10 #include "mojo/public/cpp/application/application_connection.h" 10 #include "mojo/public/cpp/application/application_connection.h"
11 #include "mojo/public/cpp/application/application_delegate.h" 11 #include "mojo/public/cpp/application/application_delegate.h"
12 #include "mojo/public/cpp/application/application_impl.h" 12 #include "mojo/public/cpp/application/application_impl.h"
13 #include "mojo/public/cpp/application/interface_factory_impl.h" 13 #include "mojo/public/cpp/application/interface_factory_impl.h"
14 #include "mojo/services/public/cpp/view_manager/view.h" 14 #include "mojo/services/public/cpp/view_manager/view.h"
15 #include "mojo/services/public/cpp/view_manager/view_manager.h" 15 #include "mojo/services/public/cpp/view_manager/view_manager.h"
16 #include "mojo/services/public/cpp/view_manager/view_manager_client_factory.h" 16 #include "mojo/services/public/cpp/view_manager/view_manager_client_factory.h"
17 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h" 17 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h"
18 #include "mojo/services/public/cpp/view_manager/view_observer.h" 18 #include "mojo/services/public/cpp/view_manager/view_observer.h"
19 #include "mojo/services/public/interfaces/navigation/navigation.mojom.h" 19 #include "mojo/services/public/interfaces/navigation/navigation.mojom.h"
20 #include "ui/events/event_constants.h" 20 #include "ui/events/event_constants.h"
21 #include "url/gurl.h" 21 #include "url/gurl.h"
22 #include "url/url_util.h" 22 #include "url/url_util.h"
23 23
24 namespace mojo { 24 namespace mojo {
25 namespace examples { 25 namespace examples {
26
27 const SkColor kColors[] = { SK_ColorYELLOW,
28 SK_ColorRED,
29 SK_ColorGREEN,
30 SK_ColorMAGENTA };
31
26 class EmbeddedApp; 32 class EmbeddedApp;
27 33
28 class NavigatorImpl : public InterfaceImpl<Navigator> {
29 public:
30 explicit NavigatorImpl(EmbeddedApp* app) : app_(app) {}
31
32 private:
33 virtual void Navigate(
34 uint32 view_id,
35 NavigationDetailsPtr navigation_details,
36 ResponseDetailsPtr response_details) OVERRIDE;
37
38 EmbeddedApp* app_;
39 DISALLOW_COPY_AND_ASSIGN(NavigatorImpl);
40 };
41
42 class EmbeddedApp 34 class EmbeddedApp
43 : public ApplicationDelegate, 35 : public ApplicationDelegate,
44 public ViewManagerDelegate, 36 public ViewManagerDelegate,
45 public ViewObserver { 37 public ViewObserver {
46 public: 38 public:
47 EmbeddedApp() 39 EmbeddedApp()
48 : navigator_factory_(this), 40 : view_manager_client_factory_(this) {
49 view_manager_(NULL),
50 view_manager_client_factory_(this) {
51 url::AddStandardScheme("mojo"); 41 url::AddStandardScheme("mojo");
52 } 42 }
53 virtual ~EmbeddedApp() {} 43 virtual ~EmbeddedApp() {}
54 44
55 void SetViewColor(uint32 view_id, SkColor color) {
56 pending_view_colors_[view_id] = color;
57 ProcessPendingViewColor(view_id);
58 }
59
60 private: 45 private:
61 46
62 // Overridden from ApplicationDelegate: 47 // Overridden from ApplicationDelegate:
63 virtual void Initialize(ApplicationImpl* app) MOJO_OVERRIDE { 48 virtual void Initialize(ApplicationImpl* app) MOJO_OVERRIDE {
64 // TODO(aa): Weird for embeddee to talk to embedder by URL. Seems like 49 // TODO(aa): Weird for embeddee to talk to embedder by URL. Seems like
65 // embedder should be able to specify the SP embeddee receives, then 50 // embedder should be able to specify the SP embeddee receives, then
66 // communication can be anonymous. 51 // communication can be anonymous.
67 app->ConnectToService("mojo:mojo_window_manager", &navigator_host_); 52 app->ConnectToService("mojo:mojo_window_manager", &navigator_host_);
68 } 53 }
69 54
70 virtual bool ConfigureIncomingConnection(ApplicationConnection* connection) 55 virtual bool ConfigureIncomingConnection(ApplicationConnection* connection)
71 MOJO_OVERRIDE { 56 MOJO_OVERRIDE {
72 connection->AddService(&view_manager_client_factory_); 57 connection->AddService(&view_manager_client_factory_);
73 connection->AddService(&navigator_factory_);
74 return true; 58 return true;
75 } 59 }
76 60
77 // Overridden from ViewManagerDelegate: 61 // Overridden from ViewManagerDelegate:
78 virtual void OnEmbed(ViewManager* view_manager, 62 virtual void OnEmbed(ViewManager* view_manager,
79 View* root, 63 View* root,
80 ServiceProviderImpl* exported_services, 64 ServiceProviderImpl* exported_services,
81 scoped_ptr<ServiceProvider> imported_services) OVERRIDE { 65 scoped_ptr<ServiceProvider> imported_services) OVERRIDE {
82 root->AddObserver(this); 66 root->AddObserver(this);
83 roots_[root->id()] = root; 67 roots_[root->id()] = root;
84 ProcessPendingViewColor(root->id()); 68 root->SetColor(kColors[next_color_++ % arraysize(kColors)]);
85 } 69 }
86 virtual void OnViewManagerDisconnected(ViewManager* view_manager) OVERRIDE { 70 virtual void OnViewManagerDisconnected(ViewManager* view_manager) OVERRIDE {
87 base::MessageLoop::current()->Quit(); 71 base::MessageLoop::current()->Quit();
88 } 72 }
89 73
90 // Overridden from ViewObserver: 74 // Overridden from ViewObserver:
91 virtual void OnViewDestroyed(View* view) OVERRIDE { 75 virtual void OnViewDestroyed(View* view) OVERRIDE {
92 DCHECK(roots_.find(view->id()) != roots_.end()); 76 DCHECK(roots_.find(view->id()) != roots_.end());
93 roots_.erase(view->id()); 77 roots_.erase(view->id());
94 } 78 }
95 virtual void OnViewInputEvent(View* view, const EventPtr& event) OVERRIDE { 79 virtual void OnViewInputEvent(View* view, const EventPtr& event) OVERRIDE {
96 if (event->action == EVENT_TYPE_MOUSE_RELEASED) { 80 if (event->action == EVENT_TYPE_MOUSE_RELEASED) {
97 if (event->flags & EVENT_FLAGS_LEFT_MOUSE_BUTTON) { 81 if (event->flags & EVENT_FLAGS_LEFT_MOUSE_BUTTON) {
98 NavigationDetailsPtr nav_details(NavigationDetails::New()); 82 NavigationDetailsPtr nav_details(NavigationDetails::New());
99 nav_details->request->url = 83 nav_details->request->url =
100 "http://www.aaronboodman.com/z_dropbox/test.html"; 84 "http://www.aaronboodman.com/z_dropbox/test.html";
101 navigator_host_->RequestNavigate(view->id(), TARGET_SOURCE_NODE, 85 navigator_host_->RequestNavigate(view->id(), TARGET_SOURCE_NODE,
102 nav_details.Pass()); 86 nav_details.Pass());
103 } 87 }
104 } 88 }
105 } 89 }
106 90
107 void ProcessPendingViewColor(uint32 view_id) {
108 RootMap::iterator root = roots_.find(view_id);
109 if (root == roots_.end())
110 return;
111
112 PendingViewColors::iterator color = pending_view_colors_.find(view_id);
113 if (color == pending_view_colors_.end())
114 return;
115
116 root->second->SetColor(color->second);
117 pending_view_colors_.erase(color);
118 }
119
120 InterfaceFactoryImplWithContext<NavigatorImpl, EmbeddedApp>
121 navigator_factory_;
122
123 ViewManager* view_manager_;
124 NavigatorHostPtr navigator_host_; 91 NavigatorHostPtr navigator_host_;
125 ViewManagerClientFactory view_manager_client_factory_; 92 ViewManagerClientFactory view_manager_client_factory_;
126 93
127 typedef std::map<Id, View*> RootMap; 94 typedef std::map<Id, View*> RootMap;
128 RootMap roots_; 95 RootMap roots_;
129 96
130 // We can receive navigations for views we don't have yet. 97 int next_color_;
131 typedef std::map<uint32, SkColor> PendingViewColors;
132 PendingViewColors pending_view_colors_;
133 98
134 DISALLOW_COPY_AND_ASSIGN(EmbeddedApp); 99 DISALLOW_COPY_AND_ASSIGN(EmbeddedApp);
135 }; 100 };
136 101
137 void NavigatorImpl::Navigate(uint32 view_id,
138 NavigationDetailsPtr navigation_details,
139 ResponseDetailsPtr response_details) {
140 GURL url(navigation_details->request->url.To<std::string>());
141 if (!url.is_valid()) {
142 LOG(ERROR) << "URL is invalid.";
143 return;
144 }
145 // TODO(aa): Verify new URL is same origin as current origin.
146 SkColor color = 0x00;
147 if (!base::HexStringToUInt(url.path().substr(1), &color)) {
148 LOG(ERROR) << "Invalid URL, path not convertible to integer";
149 return;
150 }
151 app_->SetViewColor(view_id, color);
152 }
153
154 } // namespace examples 102 } // namespace examples
155 103
156 // static 104 // static
157 ApplicationDelegate* ApplicationDelegate::Create() { 105 ApplicationDelegate* ApplicationDelegate::Create() {
158 return new examples::EmbeddedApp; 106 return new examples::EmbeddedApp;
159 } 107 }
160 108
161 } // namespace mojo 109 } // namespace mojo
OLDNEW
« no previous file with comments | « no previous file | mojo/examples/nesting_app/nesting_app.cc » ('j') | mojo/examples/png_viewer/png_viewer.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698