| 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 "mojo/application/application_runner_chromium.h" | 5 #include "mojo/application/application_runner_chromium.h" |
| 6 #include "mojo/public/c/system/main.h" | 6 #include "mojo/public/c/system/main.h" |
| 7 #include "mojo/public/cpp/application/application_delegate.h" | 7 #include "mojo/public/cpp/application/application_delegate.h" |
| 8 #include "mojo/public/cpp/application/application_impl.h" | 8 #include "mojo/public/cpp/application/application_impl.h" |
| 9 #include "mojo/public/cpp/application/connect.h" | 9 #include "mojo/public/cpp/application/connect.h" |
| 10 #include "mojo/public/cpp/application/service_provider_impl.h" | 10 #include "mojo/public/cpp/application/service_provider_impl.h" |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 view_manager_ = nullptr; | 78 view_manager_ = nullptr; |
| 79 root_ = nullptr; | 79 root_ = nullptr; |
| 80 } | 80 } |
| 81 | 81 |
| 82 virtual void OnViewDestroyed(mojo::View* view) override { | 82 virtual void OnViewDestroyed(mojo::View* view) override { |
| 83 CHECK(false); // FIXME: This is dead code, why? | 83 CHECK(false); // FIXME: This is dead code, why? |
| 84 view->RemoveObserver(this); | 84 view->RemoveObserver(this); |
| 85 } | 85 } |
| 86 | 86 |
| 87 virtual void OnViewBoundsChanged(mojo::View* view, | 87 virtual void OnViewBoundsChanged(mojo::View* view, |
| 88 const gfx::Rect& old_bounds, | 88 const mojo::Rect& old_bounds, |
| 89 const gfx::Rect& new_bounds) override { | 89 const mojo::Rect& new_bounds) override { |
| 90 content_->SetBounds(new_bounds); | 90 content_->SetBounds(new_bounds); |
| 91 } | 91 } |
| 92 | 92 |
| 93 // Overridden from InterfaceFactory<Debugger> | 93 // Overridden from InterfaceFactory<Debugger> |
| 94 virtual void Create(mojo::ApplicationConnection* connection, | 94 virtual void Create(mojo::ApplicationConnection* connection, |
| 95 mojo::InterfaceRequest<Debugger> request) override { | 95 mojo::InterfaceRequest<Debugger> request) override { |
| 96 mojo::WeakBindToRequest(this, &request); | 96 mojo::WeakBindToRequest(this, &request); |
| 97 } | 97 } |
| 98 | 98 |
| 99 // Overridden from Debugger | 99 // Overridden from Debugger |
| 100 virtual void NavigateToURL(const mojo::String& url) override { | 100 virtual void NavigateToURL(const mojo::String& url) override { |
| 101 content_->Embed(url); | 101 content_->Embed(url); |
| 102 } | 102 } |
| 103 | 103 |
| 104 scoped_ptr<mojo::WindowManagerApp> window_manager_app_; | 104 scoped_ptr<mojo::WindowManagerApp> window_manager_app_; |
| 105 | 105 |
| 106 mojo::ViewManager* view_manager_; | 106 mojo::ViewManager* view_manager_; |
| 107 mojo::View* root_; | 107 mojo::View* root_; |
| 108 mojo::View* content_; | 108 mojo::View* content_; |
| 109 | 109 |
| 110 DISALLOW_COPY_AND_ASSIGN(SkyDebugger); | 110 DISALLOW_COPY_AND_ASSIGN(SkyDebugger); |
| 111 }; | 111 }; |
| 112 | 112 |
| 113 } // namespace sky | 113 } // namespace sky |
| 114 | 114 |
| 115 MojoResult MojoMain(MojoHandle shell_handle) { | 115 MojoResult MojoMain(MojoHandle shell_handle) { |
| 116 mojo::ApplicationRunnerChromium runner(new sky::SkyDebugger); | 116 mojo::ApplicationRunnerChromium runner(new sky::SkyDebugger); |
| 117 return runner.Run(shell_handle); | 117 return runner.Run(shell_handle); |
| 118 } | 118 } |
| OLD | NEW |