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/browser/browser.h" | 5 #include "mandoline/ui/browser/browser.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
9 #include "components/view_manager/public/cpp/view.h" | 9 #include "components/view_manager/public/cpp/view.h" |
10 #include "components/view_manager/public/cpp/view_manager_init.h" | 10 #include "components/view_manager/public/cpp/view_manager_init.h" |
11 #include "mandoline/ui/browser/browser_ui.h" | 11 #include "mandoline/ui/browser/browser_ui.h" |
12 #include "mandoline/ui/browser/merged_service_provider.h" | 12 #include "mandoline/ui/browser/merged_service_provider.h" |
13 #include "mojo/application/application_runner_chromium.h" | 13 #include "mojo/application/public/cpp/application_runner.h" |
14 #include "mojo/common/common_type_converters.h" | 14 #include "mojo/common/common_type_converters.h" |
15 #include "mojo/converters/geometry/geometry_type_converters.h" | 15 #include "mojo/converters/geometry/geometry_type_converters.h" |
16 #include "third_party/mojo/src/mojo/public/c/system/main.h" | 16 #include "third_party/mojo/src/mojo/public/c/system/main.h" |
17 #include "ui/gfx/geometry/size.h" | 17 #include "ui/gfx/geometry/size.h" |
18 | 18 |
19 namespace mandoline { | 19 namespace mandoline { |
20 namespace { | 20 namespace { |
21 | 21 |
22 gfx::Size GetInitialViewportSize() { | 22 gfx::Size GetInitialViewportSize() { |
23 #if defined(OS_ANDROID) | 23 #if defined(OS_ANDROID) |
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
174 if (!omnibox_) { | 174 if (!omnibox_) { |
175 omnibox_ = root_->view_manager()->CreateView(); | 175 omnibox_ = root_->view_manager()->CreateView(); |
176 root_->AddChild(omnibox_); | 176 root_->AddChild(omnibox_); |
177 omnibox_->SetVisible(true); | 177 omnibox_->SetVisible(true); |
178 omnibox_->SetBounds(root_->bounds()); | 178 omnibox_->SetBounds(root_->bounds()); |
179 } | 179 } |
180 omnibox_->Embed(url, services.Pass(), exposed_services.Pass()); | 180 omnibox_->Embed(url, services.Pass(), exposed_services.Pass()); |
181 } | 181 } |
182 | 182 |
183 } // namespace mandoline | 183 } // namespace mandoline |
OLD | NEW |