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/omnibox/omnibox_impl.h" | 5 #include "mandoline/ui/omnibox/omnibox_impl.h" |
6 | 6 |
7 #include "base/strings/string16.h" | 7 #include "base/strings/string16.h" |
8 #include "components/view_manager/public/cpp/view_manager_client_factory.h" | 8 #include "components/view_manager/public/cpp/view_manager_client_factory.h" |
9 #include "components/window_manager/public/interfaces/window_manager.mojom.h" | 9 #include "components/window_manager/public/interfaces/window_manager.mojom.h" |
10 #include "mandoline/ui/aura/aura_init.h" | 10 #include "mandoline/ui/aura/aura_init.h" |
11 #include "mandoline/ui/aura/native_widget_view_manager.h" | 11 #include "mandoline/ui/aura/native_widget_view_manager.h" |
| 12 #include "mojo/application/public/cpp/application_impl.h" |
12 #include "mojo/common/common_type_converters.h" | 13 #include "mojo/common/common_type_converters.h" |
13 #include "mojo/converters/geometry/geometry_type_converters.h" | 14 #include "mojo/converters/geometry/geometry_type_converters.h" |
14 #include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h" | |
15 #include "ui/views/background.h" | 15 #include "ui/views/background.h" |
16 #include "ui/views/controls/textfield/textfield.h" | 16 #include "ui/views/controls/textfield/textfield.h" |
17 #include "ui/views/widget/widget_delegate.h" | 17 #include "ui/views/widget/widget_delegate.h" |
18 | 18 |
19 namespace mandoline { | 19 namespace mandoline { |
20 | 20 |
21 //////////////////////////////////////////////////////////////////////////////// | 21 //////////////////////////////////////////////////////////////////////////////// |
22 // OmniboxImpl, public: | 22 // OmniboxImpl, public: |
23 | 23 |
24 OmniboxImpl::OmniboxImpl() | 24 OmniboxImpl::OmniboxImpl() |
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
129 } | 129 } |
130 | 130 |
131 void OmniboxImpl::ShowForURL(const mojo::String& url) { | 131 void OmniboxImpl::ShowForURL(const mojo::String& url) { |
132 url_ = url; | 132 url_ = url; |
133 mojo::WindowManagerPtr window_manager; | 133 mojo::WindowManagerPtr window_manager; |
134 app_impl_->ConnectToService("mojo:window_manager", &window_manager); | 134 app_impl_->ConnectToService("mojo:window_manager", &window_manager); |
135 window_manager->Embed("mojo:omnibox", nullptr, nullptr); | 135 window_manager->Embed("mojo:omnibox", nullptr, nullptr); |
136 } | 136 } |
137 | 137 |
138 } // namespace mandoline | 138 } // namespace mandoline |
OLD | NEW |