Omnibox app

mandoline/ui/browser/browser.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mandoline/ui/browser/browser.h"
 
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "mandoline/ui/browser/browser_ui.h"
 #include "mandoline/ui/browser/merged_service_provider.h"
 #include "mojo/application/application_runner_chromium.h"
+#include "mojo/common/common_type_converters.h"
 #include "third_party/mojo/src/mojo/public/c/system/main.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace mandoline {
 
 Browser::Browser()
     : window_manager_app_(new window_manager::WindowManagerApp(this, this)),
       root_(nullptr),
       content_(nullptr),
+      omnibox_(nullptr),
       navigator_host_(this),
       ui_(nullptr),
       weak_factory_(this) {
   exposed_services_impl_.AddService(this);
 }
 
 Browser::~Browser() {
 }
 
 base::WeakPtr<Browser> Browser::GetWeakPtr() {
   return weak_factory_.GetWeakPtr();
 }
 
-// Convenience method:
 void Browser::ReplaceContentWithURL(const mojo::String& url) {
   Embed(url, nullptr, nullptr);
 }
 
 void Browser::Initialize(mojo::ApplicationImpl* app) {
   window_manager_app_->Initialize(app);
-  ui_.reset(BrowserUI::Create(this, app->shell()));
+  ui_.reset(BrowserUI::Create(this, app));
 
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   base::CommandLine::StringVector args = command_line->GetArgs();
   if (args.empty()) {
     default_url_ = "http://www.google.com/";
   } else {
 #if defined(OS_WIN)
     default_url_ = base::WideToUTF8(args[0]);
 #else
     default_url_ = args[0];
@@ skipping 18 matching lines @@
     mojo::InterfaceRequest<mojo::ServiceProvider> services,
     mojo::ServiceProviderPtr exposed_services) {
   // Browser does not support being embedded more than once.
   CHECK(!root_);
 
   // TODO(beng): still unhappy with the fact that both this class & the UI class
   //             know so much about these views. Figure out how to shift more to
   //             the UI class.
   root_ = root;
   content_ = root->view_manager()->CreateView();
-  ui_->Init(root_, content_);
+  ui_->Init(root_);
 
 #if defined(OS_ANDROID)
   // Resize to match the Nexus 5 aspect ratio:
   window_manager_app_->SetViewportSize(gfx::Size(320, 640));
 #else
   window_manager_app_->SetViewportSize(gfx::Size(1280, 800));
 #endif
 
   root_->AddChild(content_);
   content_->SetVisible(true);
@@ skipping 10 matching lines @@
 
 void Browser::OnViewManagerDisconnected(
     mojo::ViewManager* view_manager) {
   ui_.reset();
   root_ = nullptr;
 }
 
 void Browser::Embed(const mojo::String& url,
                     mojo::InterfaceRequest<mojo::ServiceProvider> services,
                     mojo::ServiceProviderPtr exposed_services) {
+  if (url == "mojo:omnibox") {
+    ShowOmnibox(url, services.Pass(), exposed_services.Pass());
+    return;
+  }
+
   // We can get Embed calls before we've actually been
   // embedded into the root view and content_ is created.
   // Just save the last url, we'll embed it when we're ready.
   if (!content_) {
     pending_url_ = url;
     return;
   }
 
+  GURL gurl(url.To<base::string16>());
+  bool changed = current_url_ != gurl;
+  current_url_ = gurl;
+  if (changed)
+    ui_->OnURLChanged();
+
   merged_service_provider_.reset(
       new MergedServiceProvider(exposed_services.Pass(), this));
   content_->Embed(url, services.Pass(),
                   merged_service_provider_->GetServiceProviderPtr().Pass());
 
   navigator_host_.RecordNavigation(url);
 }
 
 void Browser::OnAcceleratorPressed(mojo::View* view,
                                    mojo::KeyboardCode keyboard_code,
                                    mojo::EventFlags flags) {
   DCHECK_EQ(mojo::KEYBOARD_CODE_BROWSER_BACK, keyboard_code);
   navigator_host_.RequestNavigateHistory(-1);
 }
 
+void Browser::OpenURL(const mojo::String& url) {
+  omnibox_->SetVisible(false);
+  ReplaceContentWithURL(url);
+}
+
 void Browser::Create(mojo::ApplicationConnection* connection,
                      mojo::InterfaceRequest<mojo::NavigatorHost> request) {
   navigator_host_.Bind(request.Pass());
 }
 
+void Browser::ShowOmnibox(
+    const mojo::String& url,
+    mojo::InterfaceRequest<mojo::ServiceProvider> services,
+    mojo::ServiceProviderPtr exposed_services) {
+  if (!omnibox_) {
+    omnibox_ = root_->view_manager()->CreateView();
+    root_->AddChild(omnibox_);
+    omnibox_->SetVisible(true);
+    omnibox_->SetBounds(root_->bounds());
+  }
+  omnibox_->Embed(url, services.Pass(), exposed_services.Pass());
+}
+
 }  // namespace mandoline