Replace TabContentsViewGtk with TabContentsViewViews as part of the ongoing

chrome/browser/views/tab_contents/tab_contents_container.cc

 // Copyright (c) 2010 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 "chrome/browser/views/tab_contents/tab_contents_container.h"
 
 #include "chrome/browser/tab_contents/interstitial_page.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/browser/views/tab_contents/native_tab_contents_container.h"
 #include "chrome/common/notification_service.h"
 
+#if defined(TOUCH_UI)
+#include "chrome/browser/views/tab_contents/native_tab_contents_container_gtk.h"
+#include "chrome/browser/views/tab_contents/tab_contents_view_views.h"
+#include "views/border.h"
+#include "views/fill_layout.h"
+#endif
+
 ////////////////////////////////////////////////////////////////////////////////
 // TabContentsContainer, public:
 
 TabContentsContainer::TabContentsContainer()
     : native_container_(NULL),
       tab_contents_(NULL) {
   SetID(VIEW_ID_TAB_CONTAINER);
 }
 
 TabContentsContainer::~TabContentsContainer() {
   if (tab_contents_)
     RemoveObservers();
 }
 
 void TabContentsContainer::ChangeTabContents(TabContents* contents) {
   if (tab_contents_) {
+#if !defined(TOUCH_UI)
     native_container_->DetachContents(tab_contents_);
+#endif
     tab_contents_->WasHidden();
     RemoveObservers();
   }
   tab_contents_ = contents;
   // When detaching the last tab of the browser ChangeTabContents is invoked
   // with NULL. Don't attempt to do anything in that case.
   if (tab_contents_) {
+#if defined(TOUCH_UI)
+    views::View *v = (TabContentsViewViews*)contents->view();

[oshima, 2010/11/08 20:59:38]

static_cast

+    // Guard against re-adding ourselves, which happens because the NULL
+    // value is ignored by the pre-existing if() above.
+    if (v->GetParent() != this) {
+      AddChildView(v);
+    }
+    SetLayoutManager(new views::FillLayout());
+    Layout();

[oshima, 2010/11/08 20:59:38]

do you need to set layout manager everytime?
Also you may not need to re-layout when re-adding?

[Alex Nicolaou, 2010/11/12 04:05:00]

I moved these into the if(...)

Probably I don't need to set the layout manager every time but I don't know
where you'd prefer I set it - in the constructor?

+#else
     native_container_->AttachContents(tab_contents_);
+#endif
     AddObservers();
   }
 }
 
 void TabContentsContainer::TabContentsFocused(TabContents* tab_contents) {
-  native_container_->TabContentsFocused(tab_contents);
+  if (native_container_)
+    native_container_->TabContentsFocused(tab_contents);
 }
 
 void TabContentsContainer::SetFastResize(bool fast_resize) {
-  native_container_->SetFastResize(fast_resize);
+  if (native_container_)
+    native_container_->SetFastResize(fast_resize);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TabContentsContainer, NotificationObserver implementation:
 
 void TabContentsContainer::Observe(NotificationType type,
                                    const NotificationSource& source,
                                    const NotificationDetails& details) {
   if (type == NotificationType::RENDER_VIEW_HOST_CHANGED) {
     RenderViewHostSwitchedDetails* switched_details =
         Details<RenderViewHostSwitchedDetails>(details).ptr();
     RenderViewHostChanged(switched_details->old_host,
                           switched_details->new_host);
   } else if (type == NotificationType::TAB_CONTENTS_DESTROYED) {
     TabContentsDestroyed(Source<TabContents>(source).ptr());
   } else {
     NOTREACHED();
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TabContentsContainer, View overrides:
 
 void TabContentsContainer::Layout() {
+#if defined(TOUCH_UI)
+  views::View::Layout();
+#else
   if (native_container_) {
     native_container_->GetView()->SetBounds(0, 0, width(), height());
     native_container_->GetView()->Layout();
   }
+#endif
 }
 
 AccessibilityTypes::Role TabContentsContainer::GetAccessibleRole() {
   return AccessibilityTypes::ROLE_WINDOW;
 }
 
 void TabContentsContainer::ViewHierarchyChanged(bool is_add,
                                                 views::View* parent,
                                                 views::View* child) {
+#if defined(TOUCH_UI)
+  views::View::ViewHierarchyChanged(is_add, parent, child);
+#else
   if (is_add && child == this) {
     native_container_ = NativeTabContentsContainer::CreateNativeContainer(this);
     AddChildView(native_container_->GetView());
   }
+#endif
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TabContentsContainer, private:
 
 void TabContentsContainer::AddObservers() {
   // TabContents can change their RenderViewHost and hence the HWND that is
   // shown and getting focused.  We need to keep track of that so we install
   // the focus subclass on the shown HWND so we intercept focus change events.
   registrar_.Add(this,
                  NotificationType::RENDER_VIEW_HOST_CHANGED,
                  Source<NavigationController>(&tab_contents_->controller()));
 
   registrar_.Add(this,
                  NotificationType::TAB_CONTENTS_DESTROYED,
                  Source<TabContents>(tab_contents_));
 }
 
 void TabContentsContainer::RemoveObservers() {
   registrar_.RemoveAll();
 }
 
 void TabContentsContainer::RenderViewHostChanged(RenderViewHost* old_host,
                                                  RenderViewHost* new_host) {
+#if defined(TOUCH_UI)
+  NOTIMPLEMENTED(); // TODO(anicolao)
+#else
   native_container_->RenderViewHostChanged(old_host, new_host);
+#endif
 }
 
 void TabContentsContainer::TabContentsDestroyed(TabContents* contents) {
   // Sometimes, a TabContents is destroyed before we know about it. This allows
   // us to clean up our state in case this happens.
   DCHECK(contents == tab_contents_);
   ChangeTabContents(NULL);
 }