| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "mandoline/ui/desktop_ui/browser_window.h" | 5 #include "mandoline/ui/desktop_ui/browser_window.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/strings/string16.h" | 8 #include "base/strings/string16.h" |
| 9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
| 10 #include "base/time/time.h" | 10 #include "base/time/time.h" |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 progress_bar_(nullptr), | 79 progress_bar_(nullptr), |
| 80 find_bar_view_(nullptr), | 80 find_bar_view_(nullptr), |
| 81 root_(nullptr), | 81 root_(nullptr), |
| 82 content_(nullptr), | 82 content_(nullptr), |
| 83 omnibox_view_(nullptr), | 83 omnibox_view_(nullptr), |
| 84 find_active_(0), | 84 find_active_(0), |
| 85 find_count_(0), | 85 find_count_(0), |
| 86 web_view_(this) { | 86 web_view_(this) { |
| 87 mus::mojom::WindowTreeHostClientPtr host_client; | 87 mus::mojom::WindowTreeHostClientPtr host_client; |
| 88 host_client_binding_.Bind(GetProxy(&host_client)); | 88 host_client_binding_.Bind(GetProxy(&host_client)); |
| 89 mus::CreateWindowTreeHost(host_factory, host_client.Pass(), this, &host_); | 89 mus::CreateWindowTreeHost(host_factory, host_client.Pass(), this, &host_, |
| 90 nullptr); |
| 90 } | 91 } |
| 91 | 92 |
| 92 void BrowserWindow::LoadURL(const GURL& url) { | 93 void BrowserWindow::LoadURL(const GURL& url) { |
| 93 // Haven't been embedded yet, can't embed. | 94 // Haven't been embedded yet, can't embed. |
| 94 // TODO(beng): remove this. | 95 // TODO(beng): remove this. |
| 95 if (!root_) { | 96 if (!root_) { |
| 96 default_url_ = url; | 97 default_url_ = url; |
| 97 return; | 98 return; |
| 98 } | 99 } |
| 99 | 100 |
| (...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 420 omnibox_view_->Embed(view_tree_client.Pass()); | 421 omnibox_view_->Embed(view_tree_client.Pass()); |
| 421 | 422 |
| 422 // TODO(beng): This should be handled sufficiently by | 423 // TODO(beng): This should be handled sufficiently by |
| 423 // OmniboxImpl::ShowWindow() but unfortunately view manager policy | 424 // OmniboxImpl::ShowWindow() but unfortunately view manager policy |
| 424 // currently prevents the embedded app from changing window z for | 425 // currently prevents the embedded app from changing window z for |
| 425 // its own window. | 426 // its own window. |
| 426 omnibox_view_->MoveToFront(); | 427 omnibox_view_->MoveToFront(); |
| 427 } | 428 } |
| 428 | 429 |
| 429 } // namespace mandoline | 430 } // namespace mandoline |
| OLD | NEW |