[blimp] Add support for having multiple tabs

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/core/compositor/blimp_compositor_dependencies.h"
 #include "blimp/client/core/contents/blimp_contents_impl.h"
 #include "blimp/client/core/contents/navigation_feature.h"
 #include "blimp/client/core/contents/tab_control_feature.h"
 #include "blimp/client/core/render_widget/render_widget_feature.h"
 #include "blimp/client/public/contents/blimp_contents_observer.h"
 
-namespace {
-const int kDummyTabId = 0;
-}
-
 namespace blimp {
 namespace client {
 
 class BlimpContentsManager::BlimpContentsDeletionObserver
     : public BlimpContentsObserver {
  public:
   BlimpContentsDeletionObserver(BlimpContentsManager* blimp_contents_manager,
                                 BlimpContentsImpl* blimp_contents);
 
   void OnContentsDestroyed() override;
@@ skipping 64 matching lines @@
   // If the BlimpContents that the observer tracks is empty, it means
   // OnContentsDestroyed was called on this observer, but the task to erase
   // the observer from the map hasn't been run.
   if (observer->blimp_contents())
     return static_cast<BlimpContentsImpl*>(observer->blimp_contents());
 
   return nullptr;
 }
 
 int BlimpContentsManager::CreateBlimpContentsId() {
-  // TODO(mlliu): currently, Blimp only supports a single tab, so returning a
-  // dummy tab id. Need to return real case id when Blimp supports multiple
-  // tabs.
-  return kDummyTabId;
+  return next_blimp_contents_id_++;
 }
 
 void BlimpContentsManager::EraseObserverFromMap(int id) {
   observer_map_.erase(id);
 }
 
 void BlimpContentsManager::OnContentsDestroyed(BlimpContents* contents) {
   DCHECK(tab_exists_);
   tab_exists_ = false;
 
   int id = static_cast<BlimpContentsImpl*>(contents)->id();
 
   // Notify the engine that we've destroyed the BlimpContents.
   tab_control_feature_->CloseTab(id);
 
   // Destroy the observer entry from the observer_map_.
   DCHECK(base::ThreadTaskRunnerHandle::Get());
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(&BlimpContentsManager::EraseObserverFromMap,
                             this->GetWeakPtr(), id));
 }
 
 base::WeakPtr<BlimpContentsManager> BlimpContentsManager::GetWeakPtr() {
   return weak_ptr_factory_.GetWeakPtr();
 }
 
 }  // namespace client
 }  // namespace blimp