diff options
| author | mihaip@chromium.org <mihaip@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-14 21:03:53 +0000 |
|---|---|---|
| committer | mihaip@chromium.org <mihaip@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-14 21:03:53 +0000 |
| commit | dc7e52dfbcbada4abd37f12719bb0c439cbe648d (patch) | |
| tree | b40b55d5d0a3c81bf5f0f518b6f491dae66b857f /chrome/browser | |
| parent | eae9e868594cbe0e8551870ee6da96d9bcd6c98a (diff) | |
| download | chromium_src-dc7e52dfbcbada4abd37f12719bb0c439cbe648d.zip chromium_src-dc7e52dfbcbada4abd37f12719bb0c439cbe648d.tar.gz chromium_src-dc7e52dfbcbada4abd37f12719bb0c439cbe648d.tar.bz2 | |
Remove flag guard for inline installs (web store changes have been pushed).
BUG=96526
R=aa@chromium.org
Review URL: http://codereview.chromium.org/7892023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101152 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/chrome_content_browser_client.cc | 1 | ||||
| -rw-r--r-- | chrome/browser/extensions/extension_tab_helper.cc | 7 | ||||
| -rw-r--r-- | chrome/browser/extensions/webstore_inline_install_browsertest.cc | 2 |
3 files changed, 0 insertions, 10 deletions
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index 1df60b6..bfe0d4e 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -318,7 +318,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( switches::kEnableCrxlessWebApps, switches::kEnableExperimentalExtensionApis, switches::kEnableInBrowserThumbnailing, - switches::kEnableInlineWebstoreInstall, switches::kEnableIPCFuzzing, switches::kEnableNaCl, switches::kEnablePrintPreview, diff --git a/chrome/browser/extensions/extension_tab_helper.cc b/chrome/browser/extensions/extension_tab_helper.cc index 81615c4..df7209c 100644 --- a/chrome/browser/extensions/extension_tab_helper.cc +++ b/chrome/browser/extensions/extension_tab_helper.cc @@ -4,7 +4,6 @@ #include "chrome/browser/extensions/extension_tab_helper.h" -#include "base/command_line.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/webstore_inline_installer.h" #include "chrome/browser/profiles/profile.h" @@ -14,7 +13,6 @@ #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper_delegate.h" #include "chrome/common/chrome_notification_types.h" -#include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension_action.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_icon_set.h" @@ -152,11 +150,6 @@ void ExtensionTabHelper::OnInlineWebstoreInstall( int install_id, const std::string& webstore_item_id, const GURL& requestor_url) { - if (!CommandLine::ForCurrentProcess()->HasSwitch( - switches::kEnableInlineWebstoreInstall)) { - return; - } - scoped_refptr<WebstoreInlineInstaller> installer(new WebstoreInlineInstaller( tab_contents(), install_id, webstore_item_id, requestor_url, this)); installer->BeginInstall(); diff --git a/chrome/browser/extensions/webstore_inline_install_browsertest.cc b/chrome/browser/extensions/webstore_inline_install_browsertest.cc index bd91434..f6af718 100644 --- a/chrome/browser/extensions/webstore_inline_install_browsertest.cc +++ b/chrome/browser/extensions/webstore_inline_install_browsertest.cc @@ -46,8 +46,6 @@ class WebstoreInlineInstallTest : public InProcessBrowserTest { GURL crx_url = GenerateTestServerUrl(kWebstoreDomain, "extension.crx"); CommandLine::ForCurrentProcess()->AppendSwitchASCII( switches::kAppsGalleryUpdateURL, crx_url.spec()); - - command_line->AppendSwitch(switches::kEnableInlineWebstoreInstall); } virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { |