| 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/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/macros.h" | 6 #include "base/macros.h" |
| 7 #include "base/message_loop/message_loop.h" | 7 #include "base/message_loop/message_loop.h" |
| 8 #include "base/strings/stringprintf.h" | 8 #include "base/strings/stringprintf.h" |
| 9 #include "examples/bitmap_uploader/bitmap_uploader.h" | 9 #include "examples/bitmap_uploader/bitmap_uploader.h" |
| 10 #include "examples/window_manager/window_manager.mojom.h" | 10 #include "examples/window_manager/window_manager.mojom.h" |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 void OnViewManagerDisconnected(ViewManager* view_manager) override { | 77 void OnViewManagerDisconnected(ViewManager* view_manager) override { |
| 78 base::MessageLoop::current()->Quit(); | 78 base::MessageLoop::current()->Quit(); |
| 79 } | 79 } |
| 80 | 80 |
| 81 // Overridden from ViewObserver: | 81 // Overridden from ViewObserver: |
| 82 void OnViewDestroyed(View* view) override { | 82 void OnViewDestroyed(View* view) override { |
| 83 // TODO(beng): reap views & child Views. | 83 // TODO(beng): reap views & child Views. |
| 84 nested_ = NULL; | 84 nested_ = NULL; |
| 85 } | 85 } |
| 86 void OnViewInputEvent(View* view, const EventPtr& event) override { | 86 void OnViewInputEvent(View* view, const EventPtr& event) override { |
| 87 if (event->action == EVENT_TYPE_POINTER_UP) | 87 if (event->action == EventType::POINTER_UP) |
| 88 window_manager_->CloseWindow(view->id()); | 88 window_manager_->CloseWindow(view->id()); |
| 89 } | 89 } |
| 90 | 90 |
| 91 scoped_ptr<ViewManagerClientFactory> view_manager_client_factory_; | 91 scoped_ptr<ViewManagerClientFactory> view_manager_client_factory_; |
| 92 | 92 |
| 93 View* nested_; | 93 View* nested_; |
| 94 Shell* shell_; | 94 Shell* shell_; |
| 95 ::examples::IWindowManagerPtr window_manager_; | 95 ::examples::IWindowManagerPtr window_manager_; |
| 96 scoped_ptr<BitmapUploader> bitmap_uploader_; | 96 scoped_ptr<BitmapUploader> bitmap_uploader_; |
| 97 | 97 |
| 98 DISALLOW_COPY_AND_ASSIGN(NestingApp); | 98 DISALLOW_COPY_AND_ASSIGN(NestingApp); |
| 99 }; | 99 }; |
| 100 | 100 |
| 101 } // namespace examples | 101 } // namespace examples |
| 102 } // namespace mojo | 102 } // namespace mojo |
| 103 | 103 |
| 104 MojoResult MojoMain(MojoHandle application_request) { | 104 MojoResult MojoMain(MojoHandle application_request) { |
| 105 mojo::ApplicationRunnerChromium runner(new mojo::examples::NestingApp); | 105 mojo::ApplicationRunnerChromium runner(new mojo::examples::NestingApp); |
| 106 return runner.Run(application_request); | 106 return runner.Run(application_request); |
| 107 } | 107 } |
| OLD | NEW |