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

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

Powered by Google App Engine
This is Rietveld 408576698