diff options
author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-12 01:06:19 +0000 |
---|---|---|
committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-12 01:06:19 +0000 |
commit | 16095bf0140c955960f2a4a99cc344d2b519b064 (patch) | |
tree | 2f78023b02e97174b4d05895c6256212e160ed57 /chrome/browser/sidebar | |
parent | f0b739902f5235c47637c3ef3a0554189c7e7fbc (diff) | |
download | chromium_src-16095bf0140c955960f2a4a99cc344d2b519b064.zip chromium_src-16095bf0140c955960f2a4a99cc344d2b519b064.tar.gz chromium_src-16095bf0140c955960f2a4a99cc344d2b519b064.tar.bz2 |
Revert "Re-land r84928: Move ExtensionFunctionDispatcher to"
Breaks installation on webstore.
This reverts commit 73ad030f2c57a444b81351b2a1cd8546a6dbddc8.
TBR=mpcomplete@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85084 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sidebar')
-rw-r--r-- | chrome/browser/sidebar/sidebar_container.cc | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/chrome/browser/sidebar/sidebar_container.cc b/chrome/browser/sidebar/sidebar_container.cc index d1e4a33..99c69a5 100644 --- a/chrome/browser/sidebar/sidebar_container.cc +++ b/chrome/browser/sidebar/sidebar_container.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// 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. @@ -16,6 +16,7 @@ #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" @@ -31,6 +32,17 @@ 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); } |