Mandoline: Introduce ApplicationConnection::CloseConnection

mandoline/ui/browser/browser.h

 // 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.
 
 #ifndef MANDOLINE_UI_BROWSER_BROWSER_H_
 #define MANDOLINE_UI_BROWSER_BROWSER_H_
 
 #include "components/view_manager/public/cpp/view_manager.h"
 #include "components/view_manager/public/cpp/view_manager_delegate.h"
 #include "components/view_manager/public/cpp/view_manager_init.h"
 #include "components/view_manager/public/interfaces/view_manager_root.mojom.h"
 #include "mandoline/services/navigation/public/interfaces/navigation.mojom.h"
 #include "mandoline/ui/browser/navigator_host_impl.h"
 #include "mandoline/ui/browser/public/interfaces/omnibox.mojom.h"
 #include "mandoline/ui/browser/public/interfaces/view_embedder.mojom.h"
 #include "mojo/application/public/cpp/application_delegate.h"
 #include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/application/public/cpp/connect.h"
 #include "mojo/common/weak_binding_set.h"
 #include "ui/mojo/events/input_events.mojom.h"
 #include "url/gurl.h"
 
 namespace mojo {
 class ViewManagerInit;
 }
 
 namespace mandoline {
 
-class BrowserManager;
+class BrowserDelegate;
 class BrowserUI;
 class FrameTree;
 
 class Browser : public mojo::ViewManagerDelegate,
                 public mojo::ViewManagerRootClient,
                 public OmniboxClient,
                 public ViewEmbedder,
                 public mojo::InterfaceFactory<mojo::NavigatorHost>,
                 public mojo::InterfaceFactory<ViewEmbedder> {
  public:
-  Browser(mojo::ApplicationImpl* app, BrowserManager* browser_manager);
+  Browser(mojo::ApplicationImpl* app, BrowserDelegate* delegate);
   ~Browser() override;
 
   void ReplaceContentWithRequest(mojo::URLRequestPtr request);
 
   mojo::View* content() { return content_; }
   mojo::View* omnibox() { return omnibox_; }
 
   const GURL& current_url() const { return current_url_; }
 
+  mojo::ApplicationConnection* GetViewManagerConnectionForTesting();

[sky, 2015/06/29 16:56:02]

I'm not a fan of public functions for testing. I prefer friends. They don't
clutter the API.

[Fady Samuel, 2015/06/29 20:32:36]

Done.

+
   // Called once a valid device_pixel_ratio is determined. We gate construction
   // of the UI until the device_pixel_ratio is available as it's necessary to
   // properly setup the ui.
   // TODO(sky): remove this. Only here until we move to viewmanager.
   void OnDevicePixelRatioAvailable();
 
  private:
   // Overridden from mojo::ViewManagerDelegate:
   void OnEmbed(mojo::View* root) override;
   void OnEmbedForDescendant(mojo::View* view,
@@ skipping 31 matching lines @@
   mojo::URLRequestPtr pending_request_;
 
   mojo::WeakBindingSet<ViewEmbedder> view_embedder_bindings_;
 
   NavigatorHostImpl navigator_host_;
 
   GURL current_url_;
 
   scoped_ptr<BrowserUI> ui_;
   mojo::ApplicationImpl* app_;
-  BrowserManager* browser_manager_;
+  BrowserDelegate* delegate_;
 
   scoped_ptr<FrameTree> frame_tree_;
 
   DISALLOW_COPY_AND_ASSIGN(Browser);
 };
 
 }  // namespace mandoline
 
 #endif  // MANDOLINE_UI_BROWSER_BROWSER_H_