diff options
author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-11 23:54:37 +0000 |
---|---|---|
committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-11 23:54:37 +0000 |
commit | 4bae577ea5e80c18d50cbfbd69892412a960a617 (patch) | |
tree | 73992b88d7a13ba00cf4e1ec5497116938b98228 /chrome/browser/sidebar | |
parent | 7acf63cef0c03ed87b5f9f389a6b2b1828039b87 (diff) | |
download | chromium_src-4bae577ea5e80c18d50cbfbd69892412a960a617.zip chromium_src-4bae577ea5e80c18d50cbfbd69892412a960a617.tar.gz chromium_src-4bae577ea5e80c18d50cbfbd69892412a960a617.tar.bz2 |
Re-land r84928: Move ExtensionFunctionDispatcher to
ExtensionTabHelper.
This reverts commit 89a6b9d9232949a01b8263779fa819ed4d5b3089.
TBR=mpcomplete@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85076 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sidebar')
-rw-r--r-- | chrome/browser/sidebar/sidebar_container.cc | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/chrome/browser/sidebar/sidebar_container.cc b/chrome/browser/sidebar/sidebar_container.cc index 99c69a5..d1e4a33 100644 --- a/chrome/browser/sidebar/sidebar_container.cc +++ b/chrome/browser/sidebar/sidebar_container.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -16,7 +16,6 @@ #include "content/browser/tab_contents/navigation_entry.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_view.h" -#include "content/common/bindings_policy.h" #include "googleurl/src/gurl.h" #include "third_party/skia/include/core/SkBitmap.h" @@ -32,17 +31,6 @@ SidebarContainer::SidebarContainer(TabContents* tab, // Create TabContents for sidebar. sidebar_contents_.reset( new TabContents(tab->profile(), NULL, MSG_ROUTING_NONE, NULL, NULL)); - sidebar_contents_->render_view_host()->set_is_extension_process(true); - const Extension* extension = GetExtension(); - if (extension && extension->is_app()) { - ExtensionService* service = tab->profile()->GetExtensionService(); - if (service) { - service->SetInstalledAppForRenderer( - sidebar_contents_->render_view_host()->process()->id(), extension); - } - } - sidebar_contents_->render_view_host()->AllowBindings( - BindingsPolicy::EXTENSION); sidebar_contents_->set_delegate(this); } |