Add interfaces for most major Blimp net components.

blimp/engine/browser/blimp_engine_session.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 "blimp/engine/browser/blimp_engine_session.h"
 
+#include "base/bind_helpers.h"
 #include "blimp/common/proto/blimp_message.pb.h"
 #include "blimp/common/proto/control.pb.h"
 #include "blimp/engine/browser/blimp_browser_context.h"
 #include "blimp/engine/ui/blimp_layout_manager.h"
 #include "blimp/engine/ui/blimp_screen.h"
 #include "blimp/engine/ui/blimp_ui_context_factory.h"
 #include "blimp/net/blimp_connection.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/web_contents.h"
+#include "net/base/net_errors.h"
 #include "ui/aura/client/default_capture_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/wm/core/base_focus_rules.h"
 #include "ui/wm/core/default_activation_client.h"
 #include "ui/wm/core/focus_controller.h"
 
 #if !defined(USE_X11)
 #include "blimp/engine/ui/blimp_window_tree_host.h"
@@ skipping 59 matching lines @@
 void BlimpEngineSession::AttachClientConnection(
     scoped_ptr<BlimpConnection> client_connection) {
   DCHECK(client_connection);
   client_connection_ = client_connection.Pass();
 
   // TODO(haibinlu): Remove this once we can use client connection to send in
   // a navigation message.
   BlimpMessage message;
   message.set_type(BlimpMessage::CONTROL);
   message.mutable_control()->set_type(ControlMessage::CREATE_TAB);
-  OnBlimpMessage(message);
+  ProcessMessage(message, base::Callback<void(int)>());

[haibinlu, 2015/11/04 20:33:20]

net::CompletionCallback() ?

[Kevin M, 2015/11/04 20:49:48]

Done.

   message.mutable_control()->set_type(ControlMessage::LOAD_URL);
   message.mutable_control()->mutable_load_url()->set_url(
       "https://www.google.com/");
-  OnBlimpMessage(message);
+  ProcessMessage(message, base::Callback<void(int)>());
 }
 
 void BlimpEngineSession::CreateWebContents(const int target_tab_id) {
   // TODO(haibinlu): Support more than one active WebContents (crbug/547231).
   DCHECK(!web_contents_);
   content::WebContents::CreateParams create_params(browser_context_.get(),
                                                    nullptr);
   scoped_ptr<content::WebContents> new_contents =
       make_scoped_ptr(content::WebContents::Create(create_params));
   PlatformSetContents(new_contents.Pass());
 }
 
 void BlimpEngineSession::LoadUrl(const int target_tab_id, const GURL& url) {
   if (url.is_empty() || !web_contents_)
     return;
 
   content::NavigationController::LoadURLParams params(url);
   params.transition_type = ui::PageTransitionFromInt(
       ui::PAGE_TRANSITION_TYPED | ui::PAGE_TRANSITION_FROM_ADDRESS_BAR);
   web_contents_->GetController().LoadURLWithParams(params);
   web_contents_->Focus();
 }
 
-net::Error BlimpEngineSession::OnBlimpMessage(const BlimpMessage& message) {
+void BlimpEngineSession::ProcessMessage(
+    const BlimpMessage& message,
+    const net::CompletionCallback& callback) {
   DCHECK(message.type() == BlimpMessage::CONTROL);
 
   switch (message.control().type()) {
     case ControlMessage::CREATE_TAB:
       CreateWebContents(message.target_tab_id());
       break;
     case ControlMessage::LOAD_URL:
       LoadUrl(message.target_tab_id(),
               GURL(message.control().load_url().url()));
       break;
     default:
       NOTIMPLEMENTED();
   }

[haibinlu, 2015/11/04 20:33:20]

invoke callback with net::OK?

[Kevin M, 2015/11/04 20:49:48]

Done.

-
-  return net::OK;
 }
 
 void BlimpEngineSession::AddNewContents(content::WebContents* source,
                                         content::WebContents* new_contents,
                                         WindowOpenDisposition disposition,
                                         const gfx::Rect& initial_rect,
                                         bool user_gesture,
                                         bool* was_blocked) {
   NOTIMPLEMENTED();
 }
@@ skipping 54 matching lines @@
 
   aura::Window* parent = window_tree_host_->window();
   aura::Window* content = web_contents_->GetNativeView();
   if (!parent->Contains(content))
     parent->AddChild(content);
   content->Show();
 }
 
 }  // namespace engine
 }  // namespace blimp