Mandoline: Introduce ApplicationConnection::CloseConnection

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 "components/view_manager/public/cpp/view.h"
 #include "components/view_manager/public/cpp/view_manager_init.h"
 #include "mandoline/tab/frame.h"
 #include "mandoline/tab/frame_connection.h"
 #include "mandoline/tab/frame_tree.h"
-#include "mandoline/ui/browser/browser_manager.h"
+#include "mandoline/ui/browser/browser_delegate.h"
 #include "mandoline/ui/browser/browser_ui.h"
 #include "mojo/application/public/cpp/application_runner.h"
 #include "mojo/common/common_type_converters.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "third_party/mojo/src/mojo/public/c/system/main.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace mandoline {
 namespace {
 
 gfx::Size GetInitialViewportSize() {
 #if defined(OS_ANDROID)
   // Resize to match the Nexus 5 aspect ratio:
   return gfx::Size(320, 640);
 #else
   return gfx::Size(1280, 800);
 #endif
 }
 
 }  // namespace
 
-Browser::Browser(mojo::ApplicationImpl* app, BrowserManager* browser_manager)
+Browser::Browser(mojo::ApplicationImpl* app, BrowserDelegate* delegate)
     : view_manager_init_(app, this, this),
       root_(nullptr),
       content_(nullptr),
       omnibox_(nullptr),
       navigator_host_(this),
       app_(app),
-      browser_manager_(browser_manager) {
+      delegate_(delegate) {
   view_manager_init_.connection()->AddService<ViewEmbedder>(this);
 
   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];
 #endif
   }
 }
 
 Browser::~Browser() {
   // Destruct ui_ manually while |this| is alive and reset the pointer first.
   // This is to avoid a double delete when OnViewManagerDestroyed gets
   // called.
   ui_.reset();
 }
 
 void Browser::ReplaceContentWithRequest(mojo::URLRequestPtr request) {
   Embed(request.Pass());
 }
 
+mojo::ApplicationConnection* Browser::GetViewManagerConnectionForTesting() {

[sky, 2015/06/30 16:41:46]

Position should match that of header.

[Fady Samuel, 2015/06/30 17:31:19]

Done.

+  return view_manager_init_.connection();
+}
+
 void Browser::OnDevicePixelRatioAvailable() {
   content_ = root_->view_manager()->CreateView();
   ui_->Init(root_);
 
   view_manager_init_.view_manager_root()->SetViewportSize(
       mojo::Size::From(GetInitialViewportSize()));
 
   root_->AddChild(content_);
   content_->SetVisible(true);
 
@@ skipping 16 matching lines @@
 
   // Make it so we get OnWillEmbed() for any Embed()s done by other apps we
   // Embed().
   root->view_manager()->SetEmbedRoot();
 
   // 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;
 
-  if (!browser_manager_->InitUIIfNecessary(this, root_))
+  if (!delegate_->InitUIIfNecessary(this, root_))
     return;  // We'll be called back from OnDevicePixelRatioAvailable().
   OnDevicePixelRatioAvailable();
 }
 
 void Browser::OnEmbedForDescendant(mojo::View* view,
                                    mojo::URLRequestPtr request,
                                    mojo::ViewManagerClientPtr* client) {
   // TODO(sky): move this to Frame/FrameTree.
   Frame* frame = Frame::FindFirstFrameAncestor(view);
   if (!frame || !frame->HasAncestor(frame_tree_->root()) ||
       frame == frame_tree_->root()) {
     // TODO(sky): add requestor url so that we can return false if it's not
     // an app we expect.
     mojo::ApplicationConnection* connection =
         app_->ConnectToApplication(request.Pass());
     connection->ConnectToService(client);
     return;
   }
 
   scoped_ptr<FrameConnection> frame_connection(new FrameConnection);
   frame_connection->Init(app_, request.Pass(), client);
   FrameTreeClient* frame_tree_client = frame_connection->frame_tree_client();
   frame_tree_->CreateOrReplaceFrame(frame, view, frame_tree_client,
                                     frame_connection.Pass());
 }
 
 void Browser::OnViewManagerDestroyed(mojo::ViewManager* view_manager) {
   ui_.reset();
   root_ = nullptr;
-  browser_manager_->BrowserClosed(this);
+  delegate_->BrowserClosed(this);
 }
 
 void Browser::OnAccelerator(mojo::EventPtr event) {
   DCHECK_EQ(mojo::KEYBOARD_CODE_BROWSER_BACK,
             event->key_data->windows_key_code);
   navigator_host_.RequestNavigateHistory(-1);
 }
 
 void Browser::OpenURL(const mojo::String& url) {
   omnibox_->SetVisible(false);
@@ skipping 54 matching lines @@
     omnibox_->SetBounds(root_->bounds());
   }
   mojo::ViewManagerClientPtr view_manager_client;
   mojo::ApplicationConnection* connection =
       app_->ConnectToApplication(request.Pass());
   connection->ConnectToService(&view_manager_client);
   omnibox_->Embed(view_manager_client.Pass());
 }
 
 }  // namespace mandoline