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/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" |
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
74 } | 74 } |
75 | 75 |
76 // Overridden from ViewObserver: | 76 // Overridden from ViewObserver: |
77 virtual void OnViewDestroyed(View* view) OVERRIDE { | 77 virtual void OnViewDestroyed(View* view) OVERRIDE { |
78 DCHECK(windows_.find(view->id()) != windows_.end()); | 78 DCHECK(windows_.find(view->id()) != windows_.end()); |
79 windows_.erase(view->id()); | 79 windows_.erase(view->id()); |
80 } | 80 } |
81 virtual void OnViewInputEvent(View* view, const EventPtr& event) OVERRIDE { | 81 virtual void OnViewInputEvent(View* view, const EventPtr& event) OVERRIDE { |
82 if (event->action == EVENT_TYPE_MOUSE_RELEASED) { | 82 if (event->action == EVENT_TYPE_MOUSE_RELEASED) { |
83 if (event->flags & EVENT_FLAGS_LEFT_MOUSE_BUTTON) { | 83 if (event->flags & EVENT_FLAGS_LEFT_MOUSE_BUTTON) { |
84 NavigationDetailsPtr nav_details(NavigationDetails::New()); | 84 URLRequestPtr request(URLRequest::New()); |
85 nav_details->request->url = | 85 request->url = "http://www.aaronboodman.com/z_dropbox/test.html"; |
86 "http://www.aaronboodman.com/z_dropbox/test.html"; | |
87 NavigatorHostPtr navigator_host; | 86 NavigatorHostPtr navigator_host; |
88 ConnectToService(windows_[view->id()]->embedder_service_provider.get(), | 87 ConnectToService(windows_[view->id()]->embedder_service_provider.get(), |
89 &navigator_host); | 88 &navigator_host); |
90 navigator_host->RequestNavigate(TARGET_SOURCE_NODE, nav_details.Pass()); | 89 navigator_host->RequestNavigate(TARGET_SOURCE_NODE, request.Pass()); |
91 } | 90 } |
92 } | 91 } |
93 } | 92 } |
94 | 93 |
95 scoped_ptr<ViewManagerClientFactory> view_manager_client_factory_; | 94 scoped_ptr<ViewManagerClientFactory> view_manager_client_factory_; |
96 | 95 |
97 typedef std::map<Id, Window*> WindowMap; | 96 typedef std::map<Id, Window*> WindowMap; |
98 WindowMap windows_; | 97 WindowMap windows_; |
99 | 98 |
100 int next_color_; | 99 int next_color_; |
101 | 100 |
102 DISALLOW_COPY_AND_ASSIGN(EmbeddedApp); | 101 DISALLOW_COPY_AND_ASSIGN(EmbeddedApp); |
103 }; | 102 }; |
104 | 103 |
105 } // namespace examples | 104 } // namespace examples |
106 } // namespace mojo | 105 } // namespace mojo |
107 | 106 |
108 MojoResult MojoMain(MojoHandle shell_handle) { | 107 MojoResult MojoMain(MojoHandle shell_handle) { |
109 mojo::ApplicationRunnerChromium runner(new mojo::examples::EmbeddedApp); | 108 mojo::ApplicationRunnerChromium runner(new mojo::examples::EmbeddedApp); |
110 return runner.Run(shell_handle); | 109 return runner.Run(shell_handle); |
111 } | 110 } |
OLD | NEW |