Add TabControlFeature to BlimpClientContextImpl

blimp/client/core/contents/blimp_contents_manager.cc

 // 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.
 
 #include "blimp/client/core/contents/blimp_contents_manager.h"
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "blimp/client/public/contents/blimp_contents_observer.h"
@@ skipping 21 matching lines @@
 };
 
 BlimpContentsManager::BlimpContentsDeletionObserver::
     BlimpContentsDeletionObserver(BlimpContentsManager* blimp_contents_manager,
                                   BlimpContentsImpl* blimp_contents)
     : BlimpContentsObserver(blimp_contents),
       blimp_contents_manager_(blimp_contents_manager) {}
 
 void BlimpContentsManager::BlimpContentsDeletionObserver::
     OnContentsDestroyed() {
   BlimpContents* contents = blimp_contents();

[David Trainor- moved to gerrit, 2016/08/18 17:41:58]

It might make sense to change this now.  We don't properly interact with the
TabControlFeature here.  We probably want:

blimp_contents_manager_->CloseTab(blimp_contents);

CloseTab can properly remove call tab_control_feature->CloseTab(id) and can then
post a task to remove the observer from the map.

[Menglin, 2016/08/19 00:50:21]

Done.

   int id = static_cast<BlimpContentsImpl*>(contents)->id();
   DCHECK(base::ThreadTaskRunnerHandle::Get());
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(&BlimpContentsManager::EraseObserverFromMap,
                             blimp_contents_manager_->GetWeakPtr(), id));
 }
 
 BlimpContentsManager::BlimpContentsManager() : weak_ptr_factory_(this) {}
 
 BlimpContentsManager::~BlimpContentsManager() {}
 
-std::unique_ptr<BlimpContentsImpl> BlimpContentsManager::CreateBlimpContents() {
+std::unique_ptr<BlimpContentsImpl> BlimpContentsManager::CreateBlimpContents(

[David Trainor- moved to gerrit, 2016/08/18 17:41:58]

This class should also call tab_control_feature->CreateTab.

[Menglin, 2016/08/19 00:50:21]

Done.

+    TabControlFeature* tab_control_feature) {
   int id = CreateBlimpContentsId();
   std::unique_ptr<BlimpContentsImpl> new_contents =
-      base::MakeUnique<BlimpContentsImpl>(id);
+      base::MakeUnique<BlimpContentsImpl>(id, tab_control_feature);
   std::unique_ptr<BlimpContentsDeletionObserver> observer =
       base::MakeUnique<BlimpContentsDeletionObserver>(this, new_contents.get());
   observer_map_.insert(
       std::pair<int, std::unique_ptr<BlimpContentsDeletionObserver>>(
           id, std::move(observer)));
   return new_contents;
 }
 
 BlimpContentsImpl* BlimpContentsManager::GetBlimpContents(int id) {
   if (observer_map_.find(id) == observer_map_.end()) return nullptr;
@@ skipping 18 matching lines @@
 void BlimpContentsManager::EraseObserverFromMap(int id) {
   observer_map_.erase(id);
 }
 
 base::WeakPtr<BlimpContentsManager> BlimpContentsManager::GetWeakPtr() {
   return weak_ptr_factory_.GetWeakPtr();
 }
 
 }  // namespace client
 }  // namespace blimp