Revert of Add a basic browser to mash that uses the navigation service.

services/navigation/view_impl.h

Index: services/navigation/view_impl.h
diff --git a/services/navigation/view_impl.h b/services/navigation/view_impl.h
index 426185f7c9c9bad71a407478a5556da597c68af8..e28281326ceaaa01fa6fceba54da4d1a5479a617 100644
--- a/services/navigation/view_impl.h
+++ b/services/navigation/view_impl.h
@@ -6,7 +6,6 @@
 #define SERVICES_NAVIGATION_VIEW_IMPL_H_
 
 #include "base/macros.h"
-#include "components/mus/public/cpp/window_tree_delegate.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
@@ -14,22 +13,13 @@
 #include "services/shell/public/cpp/interface_factory.h"
 #include "services/shell/public/cpp/shell_client.h"
 #include "services/shell/public/cpp/shell_connection_ref.h"
-#include "ui/views/widget/widget_delegate.h"
-
-namespace views {
-class WebView;
-class Widget;
-}
 
 namespace navigation {
 
 class ViewImpl : public mojom::View,
-                 public content::WebContentsDelegate,
-                 public mus::WindowTreeDelegate,
-                 public views::WidgetDelegate {
+                 public content::WebContentsDelegate {
  public:
-  ViewImpl(shell::Connector* connector,
-           content::BrowserContext* browser_context,
+  ViewImpl(content::BrowserContext* browser_context,
            mojom::ViewClientPtr client,
            mojom::ViewRequest request,
            std::unique_ptr<shell::ShellConnectionRef> ref);
@@ -37,49 +27,17 @@
 
  private:
   // mojom::View:
-  void NavigateTo(const GURL& url) override;
-  void GoBack() override;
-  void GoForward() override;
-  void Reload(bool skip_cache) override;
-  void Stop() override;
-  void GetWindowTreeClient(
-      mus::mojom::WindowTreeClientRequest request) override;
+  void LoadUrl(const GURL& url) override;
 
   // content::WebContentsDelegate:
-  void AddNewContents(content::WebContents* source,
-                      content::WebContents* new_contents,
-                      WindowOpenDisposition disposition,
-                      const gfx::Rect& initial_rect,
-                      bool user_gesture,
-                      bool* was_blocked) override;
-  void CloseContents(content::WebContents* source) override;
   void LoadingStateChanged(content::WebContents* source,
                            bool to_different_document) override;
-  void NavigationStateChanged(content::WebContents* source,
-                              content::InvalidateTypes changed_flags) override;
-  void LoadProgressChanged(content::WebContents* source,
-                           double progress) override;
 
-  // mus::WindowTreeDelegate:
-  void OnEmbed(mus::Window* root) override;
-  void OnConnectionLost(mus::WindowTreeConnection* connection) override;
-  void OnEventObserved(const ui::Event& event, mus::Window* target) override;
-
-  // views::WidgetDelegate:
-  views::View* GetContentsView() override;
-  views::Widget* GetWidget() override;
-  const views::Widget* GetWidget() const override;
-
-  shell::Connector* connector_;
   mojo::StrongBinding<mojom::View> binding_;
   mojom::ViewClientPtr client_;
   std::unique_ptr<shell::ShellConnectionRef> ref_;
 
-  views::WebView* web_view_;
-
   std::unique_ptr<content::WebContents> web_contents_;
-
-  std::unique_ptr<views::Widget> widget_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewImpl);
 };