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 <map> | 5 #include <map> |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/macros.h" | 8 #include "base/macros.h" |
9 #include "base/stl_util.h" | 9 #include "base/stl_util.h" |
10 #include "examples/bitmap_uploader/bitmap_uploader.h" | 10 #include "examples/bitmap_uploader/bitmap_uploader.h" |
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
155 embeddee_->HelloBack(base::Bind(&WMFlowApp::HelloBackAck, | 155 embeddee_->HelloBack(base::Bind(&WMFlowApp::HelloBackAck, |
156 base::Unretained(this))); | 156 base::Unretained(this))); |
157 } | 157 } |
158 void OnViewManagerDisconnected(mojo::ViewManager* view_manager) override { | 158 void OnViewManagerDisconnected(mojo::ViewManager* view_manager) override { |
159 STLDeleteValues(&uploaders_); | 159 STLDeleteValues(&uploaders_); |
160 } | 160 } |
161 | 161 |
162 // Overridden from mojo::ViewObserver: | 162 // Overridden from mojo::ViewObserver: |
163 void OnViewInputEvent(mojo::View* view, | 163 void OnViewInputEvent(mojo::View* view, |
164 const mojo::EventPtr& event) override { | 164 const mojo::EventPtr& event) override { |
165 if (event->action == mojo::EVENT_TYPE_POINTER_UP && | 165 if (event->action == mojo::EventType::POINTER_UP && |
166 event->flags & mojo::EVENT_FLAGS_LEFT_MOUSE_BUTTON) { | 166 event->flags & mojo::EventFlags::LEFT_MOUSE_BUTTON) { |
167 OpenNewWindow(); | 167 OpenNewWindow(); |
168 } | 168 } |
169 } | 169 } |
170 void OnViewDestroyed(mojo::View* view) override { | 170 void OnViewDestroyed(mojo::View* view) override { |
171 if (uploaders_.find(view) != uploaders_.end()) { | 171 if (uploaders_.find(view) != uploaders_.end()) { |
172 delete uploaders_[view]; | 172 delete uploaders_[view]; |
173 uploaders_.erase(view); | 173 uploaders_.erase(view); |
174 } | 174 } |
175 --embed_count_; | 175 --embed_count_; |
176 view->RemoveObserver(this); | 176 view->RemoveObserver(this); |
(...skipping 16 matching lines...) Expand all Loading... |
193 | 193 |
194 DISALLOW_COPY_AND_ASSIGN(WMFlowApp); | 194 DISALLOW_COPY_AND_ASSIGN(WMFlowApp); |
195 }; | 195 }; |
196 | 196 |
197 } // namespace examples | 197 } // namespace examples |
198 | 198 |
199 MojoResult MojoMain(MojoHandle application_request) { | 199 MojoResult MojoMain(MojoHandle application_request) { |
200 mojo::ApplicationRunnerChromium runner(new examples::WMFlowApp); | 200 mojo::ApplicationRunnerChromium runner(new examples::WMFlowApp); |
201 return runner.Run(application_request); | 201 return runner.Run(application_request); |
202 } | 202 } |
OLD | NEW |