Part 1 of merging Extensions and DOMUI

chrome/browser/external_tab_container.cc

 // Copyright (c) 2006-2008 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/external_tab_container.h"
 
 #include "app/l10n_util.h"
 #include "app/win_util.h"
 #include "base/logging.h"
 #include "base/win_util.h"
 #include "chrome/browser/automation/automation_provider.h"
 #include "chrome/browser/browser.h"
-#include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/browser/load_notification_details.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/provisional_load_details.h"
 #include "chrome/browser/views/tab_contents/render_view_context_menu_external_win.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/views/tab_contents/tab_contents_container.h"
+#include "chrome/common/bindings_policy.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/test/automation/automation_messages.h"
 
 #include "grit/generated_resources.h"
 
 static const wchar_t kWindowObjectKey[] = L"ChromeWindowObject";
 
 // TODO(sanjeevr): The external_accel_table_ and external_accel_entry_count_
 // member variables are now obsolete and we don't use them.
@@ skipping 29 matching lines @@
     return false;
   }
   // TODO(jcampan): limit focus traversal to contents.
 
   // We don't ever remove the prop because the lifetime of this object
   // is the same as the lifetime of the window
   SetProp(GetNativeView(), kWindowObjectKey, this);
 
   tab_contents_ = new TabContents(profile, NULL, MSG_ROUTING_NONE, NULL);
   tab_contents_->set_delegate(this);
-  tab_contents_->render_view_host()->AllowExternalHostBindings();
+  tab_contents_->render_view_host()->AllowBindings(
+      BindingsPolicy::EXTERNAL_HOST);
 
   // Create a TabContentsContainer to handle focus cycling using Tab and
   // Shift-Tab.
   tab_contents_container_ = new TabContentsContainer;
   SetContentsView(tab_contents_container_);
 
   // Note that SetTabContents must be called after AddChildView is called
   tab_contents_container_->ChangeTabContents(tab_contents_);
 
   NavigationController* controller = &tab_contents_->controller();
@@ skipping 159 matching lines @@
 void ExternalTabContainer::ForwardMessageToExternalHost(
     const std::string& message, const std::string& origin,
     const std::string& target) {
   if(automation_) {
     automation_->Send(
         new AutomationMsg_ForwardMessageToExternalHost(0, tab_handle_,
             message, origin, target));
   }
 }
 
-ExtensionFunctionDispatcher* ExternalTabContainer::
-    CreateExtensionFunctionDispatcher(RenderViewHost* render_view_host,
-                                      const std::string& extension_id) {
-  return new ExtensionFunctionDispatcher(render_view_host, NULL, extension_id);
-}
-
 bool ExternalTabContainer::TakeFocus(bool reverse) {
   if (automation_) {
     automation_->Send(new AutomationMsg_TabbedOut(0, tab_handle_,
         win_util::IsShiftPressed()));
   }
 
   return true;
 }
 
 bool ExternalTabContainer::HandleContextMenu(const ContextMenuParams& params) {
@@ skipping 148 matching lines @@
   if (tab_contents_) {
     NotificationService::current()->Notify(
         NotificationType::EXTERNAL_TAB_CLOSED,
         Source<NavigationController>(&tab_contents_->controller()),
         Details<ExternalTabContainer>(this));
 
     delete tab_contents_;
     tab_contents_ = NULL;
   }
 }