| 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/examples/window_manager/debug_panel.h" | 5 #include "mojo/examples/window_manager/debug_panel.h" |
| 6 | 6 |
| 7 #include "base/strings/stringprintf.h" | 7 #include "base/strings/stringprintf.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 9 #include "mojo/services/public/cpp/view_manager/view.h" | 9 #include "mojo/services/public/cpp/view_manager/view.h" |
| 10 #include "mojo/views/native_widget_view_manager.h" | 10 #include "mojo/views/native_widget_view_manager.h" |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 118 if (sender == colored_square_) { | 118 if (sender == colored_square_) { |
| 119 Navigate("mojo://mojo_embedded_app/"); | 119 Navigate("mojo://mojo_embedded_app/"); |
| 120 } else if (sender == close_last_) { | 120 } else if (sender == close_last_) { |
| 121 delegate_->CloseTopWindow(); | 121 delegate_->CloseTopWindow(); |
| 122 } else if (sender == cross_app_) { | 122 } else if (sender == cross_app_) { |
| 123 Navigate("http://www.aaronboodman.com/z_dropbox/test.html"); | 123 Navigate("http://www.aaronboodman.com/z_dropbox/test.html"); |
| 124 } | 124 } |
| 125 } | 125 } |
| 126 | 126 |
| 127 void DebugPanel::Navigate(const std::string& url) { | 127 void DebugPanel::Navigate(const std::string& url) { |
| 128 NavigationDetailsPtr details(NavigationDetails::New()); | 128 URLRequestPtr request(URLRequest::New()); |
| 129 details->request->url = url; | 129 request->url = url; |
| 130 delegate_->RequestNavigate(view_->id(), TARGET_NEW_NODE, details.Pass()); | 130 delegate_->RequestNavigate(view_->id(), TARGET_NEW_NODE, request.Pass()); |
| 131 } | 131 } |
| 132 | 132 |
| 133 } // namespace examples | 133 } // namespace examples |
| 134 } // namespace mojo | 134 } // namespace mojo |
| OLD | NEW |