| 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 "sky/tools/debugger/debugger.h" | 5 #include "sky/tools/debugger/debugger.h" |
| 6 | 6 |
| 7 #include "services/window_manager/basic_focus_rules.h" | 7 #include "services/window_manager/basic_focus_rules.h" |
| 8 | 8 |
| 9 namespace sky { | 9 namespace sky { |
| 10 namespace debugger { | 10 namespace debugger { |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 SkyDebugger::~SkyDebugger() { | 21 SkyDebugger::~SkyDebugger() { |
| 22 } | 22 } |
| 23 | 23 |
| 24 base::WeakPtr<SkyDebugger> SkyDebugger::GetWeakPtr() { | 24 base::WeakPtr<SkyDebugger> SkyDebugger::GetWeakPtr() { |
| 25 return weak_factory_.GetWeakPtr(); | 25 return weak_factory_.GetWeakPtr(); |
| 26 } | 26 } |
| 27 | 27 |
| 28 void SkyDebugger::Initialize(mojo::ApplicationImpl* app) { | 28 void SkyDebugger::Initialize(mojo::ApplicationImpl* app) { |
| 29 window_manager_app_->Initialize(app); | 29 window_manager_app_->Initialize(app); |
| 30 app->ConnectToApplication("mojo:sky_debugger_prompt"); | 30 app->ConnectToApplication("mojo:sky_debugger_prompt"); |
| 31 |
| 32 // Format: --args-for="app_url default_url" |
| 33 if (app->args().size() > 1) |
| 34 default_url_ = app->args()[1]; |
| 31 } | 35 } |
| 32 | 36 |
| 33 bool SkyDebugger::ConfigureIncomingConnection( | 37 bool SkyDebugger::ConfigureIncomingConnection( |
| 34 mojo::ApplicationConnection* connection) { | 38 mojo::ApplicationConnection* connection) { |
| 35 window_manager_app_->ConfigureIncomingConnection(connection); | 39 window_manager_app_->ConfigureIncomingConnection(connection); |
| 36 connection->AddService(this); | 40 connection->AddService(this); |
| 41 |
| 42 if (!default_url_.empty()) |
| 43 NavigateToURL(default_url_); // Schedule a navigation in the new embedding. |
| 37 return true; | 44 return true; |
| 38 } | 45 } |
| 39 | 46 |
| 40 bool SkyDebugger::ConfigureOutgoingConnection( | 47 bool SkyDebugger::ConfigureOutgoingConnection( |
| 41 mojo::ApplicationConnection* connection) { | 48 mojo::ApplicationConnection* connection) { |
| 42 window_manager_app_->ConfigureOutgoingConnection(connection); | 49 window_manager_app_->ConfigureOutgoingConnection(connection); |
| 43 connection->AddService(this); | 50 connection->AddService(this); |
| 44 return true; | 51 return true; |
| 45 } | 52 } |
| 46 | 53 |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 117 } | 124 } |
| 118 | 125 |
| 119 void SkyDebugger::InjectInspector() { | 126 void SkyDebugger::InjectInspector() { |
| 120 InspectorServicePtr inspector_service; | 127 InspectorServicePtr inspector_service; |
| 121 mojo::ConnectToService(viewer_services_.get(), &inspector_service); | 128 mojo::ConnectToService(viewer_services_.get(), &inspector_service); |
| 122 inspector_service->Inject(); | 129 inspector_service->Inject(); |
| 123 } | 130 } |
| 124 | 131 |
| 125 } // namespace debugger | 132 } // namespace debugger |
| 126 } // namespace sky | 133 } // namespace sky |
| OLD | NEW |