Migrate Linux Blimp client to use BlimpClientContext

blimp/client/app/linux/blimp_main.cc

Index: blimp/client/app/linux/blimp_main.cc
diff --git a/blimp/client/app/linux/blimp_main.cc b/blimp/client/app/linux/blimp_main.cc
index 37c7c957fab2e1b06fb4030ec406acce22ff6490..d251452402d1bda0d873a510079b8bb44d6f6442 100644
--- a/blimp/client/app/linux/blimp_main.cc
+++ b/blimp/client/app/linux/blimp_main.cc
@@ -1,4 +1,4 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
+// Copyright 2016 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.
 
@@ -10,16 +10,21 @@
 #include "base/threading/thread.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "blimp/client/app/blimp_startup.h"
-#include "blimp/client/app/linux/blimp_client_session_linux.h"
-#include "blimp/client/core/contents/navigation_feature.h"
-#include "blimp/client/core/contents/tab_control_feature.h"
-#include "blimp/client/core/session/assignment_source.h"
+#include "blimp/client/app/linux/blimp_client_context_delegate_linux.h"
+#include "blimp/client/app/linux/blimp_display_manager.h"
+#include "blimp/client/app/linux/blimp_display_manager_delegate_main.h"
+#include "blimp/client/public/blimp_client_context.h"
+#include "blimp/client/public/contents/blimp_contents_view.h"
+#include "blimp/client/public/contents/blimp_navigation_controller.h"
+#include "blimp/client/support/compositor/blimp_embedder_compositor.h"

[Kevin M, 2016/09/28 01:35:46]

Is this used? Can you sift through the other dependencies and see what you can
eliminate?

[steimel, 2016/09/28 20:33:07]

Done.

+#include "blimp/client/support/compositor/compositor_dependencies_impl.h"
+#include "blimp/common/get_client_auth_token.h"

[Kevin M, 2016/09/28 01:35:47]

Not used?

[steimel, 2016/09/28 20:33:07]

Done.

 #include "ui/gfx/x/x11_connection.h"
 
 namespace {
-const char kDummyLoginToken[] = "";
-const char kDefaultUrl[] = "https://www.google.com";
-const int kDummyTabId = 0;
+constexpr char kDefaultUrl[] = "https://www.google.com";

[Kevin M, 2016/09/28 01:35:46]

Nit: this can be const char* - it's advantageous to store char buffers only once
in the binary.

[steimel, 2016/09/28 20:33:07]

Done.

+constexpr int kWindowWidth = 800;
+constexpr int kWindowHeight = 600;
 }
 
 int main(int argc, const char**argv) {
@@ -31,15 +36,40 @@ int main(int argc, const char**argv) {
   blimp::client::InitializeLogging();
   blimp::client::InitializeMainMessageLoop();
 
-  blimp::client::BlimpClientSessionLinux session;
-  session.GetTabControlFeature()->CreateTab(kDummyTabId);
-  session.Connect(kDummyLoginToken);
+  base::Thread io_thread("BlimpIOThread");
+  base::Thread::Options options;
+  options.message_loop_type = base::MessageLoop::TYPE_IO;
+  io_thread.StartWithOptions(options);
+
+  // Creating this using "new" and passing to context using "WrapUnique" as
+  // opposed to "MakeUnique" because we'll need to pass the compositor
+  // dependencies to the display manager as well.
+  blimp::client::CompositorDependencies* compositor_dependencies =
+      new blimp::client::CompositorDependenciesImpl();
+  std::unique_ptr<blimp::client::BlimpClientContext> context =
+      base::WrapUnique<blimp::client::BlimpClientContext>(
+          blimp::client::BlimpClientContext::Create(
+              io_thread.task_runner(), io_thread.task_runner(),
+              base::WrapUnique(compositor_dependencies)));
+
+  std::unique_ptr<blimp::client::BlimpClientContextDelegate> context_delegate =
+      base::MakeUnique<blimp::client::BlimpClientContextDelegateLinux>();
+  context->SetDelegate(context_delegate.get());
+
+  context->Connect();
 
   // If there is a non-switch argument to the command line, load that url.
   base::CommandLine::StringVector args =
       base::CommandLine::ForCurrentProcess()->GetArgs();
   std::string url = args.size() > 0 ? args[0] : kDefaultUrl;
-  session.GetNavigationFeature()->NavigateToUrlText(kDummyTabId, url);
+  std::unique_ptr<blimp::client::BlimpContents> contents =
+      context->CreateBlimpContents(nullptr);
+  contents->GetNavigationController().LoadURL(GURL(url));
+
+  blimp::client::BlimpDisplayManager display_manager(
+      gfx::Size(kWindowWidth, kWindowHeight),
+      new blimp::client::BlimpDisplayManagerDelegateMain(),
+      compositor_dependencies, std::move(contents));
 
   base::RunLoop().Run();
 }