| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "mash/browser/browser.h" | 5 #include "mash/browser/browser.h" |
| 6 | 6 |
| 7 #include "base/macros.h" | 7 #include "base/macros.h" |
| 8 #include "base/memory/ptr_util.h" | 8 #include "base/memory/ptr_util.h" |
| 9 #include "base/memory/weak_ptr.h" | 9 #include "base/memory/weak_ptr.h" |
| 10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
| (...skipping 879 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 890 } | 890 } |
| 891 | 891 |
| 892 UI* ui = new UI(this, UI::Type::WINDOW, CreateView()); | 892 UI* ui = new UI(this, UI::Type::WINDOW, CreateView()); |
| 893 views::Widget* window = views::Widget::CreateWindowWithContextAndBounds( | 893 views::Widget* window = views::Widget::CreateWindowWithContextAndBounds( |
| 894 ui, nullptr, gfx::Rect(10, 10, 1024, 600)); | 894 ui, nullptr, gfx::Rect(10, 10, 1024, 600)); |
| 895 ui->NavigateTo(GURL("http://www.google.com/")); | 895 ui->NavigateTo(GURL("http://www.google.com/")); |
| 896 window->Show(); | 896 window->Show(); |
| 897 AddWindow(window); | 897 AddWindow(window); |
| 898 } | 898 } |
| 899 | 899 |
| 900 void Browser::Create(shell::Connection* connection, | 900 void Browser::Create(const shell::Identity& remote_identity, |
| 901 mojom::LaunchableRequest request) { | 901 mojom::LaunchableRequest request) { |
| 902 bindings_.AddBinding(this, std::move(request)); | 902 bindings_.AddBinding(this, std::move(request)); |
| 903 } | 903 } |
| 904 | 904 |
| 905 } // namespace browser | 905 } // namespace browser |
| 906 } // namespace mash | 906 } // namespace mash |
| OLD | NEW |