diff options
| author | jcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-24 16:38:40 +0000 |
|---|---|---|
| committer | jcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-24 16:38:40 +0000 |
| commit | a807d3fceadd4838c346ba9d5b68798a0b4081d6 (patch) | |
| tree | 1c68747834fd1c2da3e522fab91ba43fda62d8b3 /chrome/browser/profile.cc | |
| parent | 2ae892453109680699580853e78e89419bceb7a8 (diff) | |
| download | chromium_src-a807d3fceadd4838c346ba9d5b68798a0b4081d6.zip chromium_src-a807d3fceadd4838c346ba9d5b68798a0b4081d6.tar.gz chromium_src-a807d3fceadd4838c346ba9d5b68798a0b4081d6.tar.bz2 | |
Revert 48042: it breaks unit-tests and UI tests on ChromeOS
Disabling app launcher and enabling apps by default on ChromeOS .
BUG=3218
TEST=Open the new tab, the new new tab should be shown. Any installed
app should be showing in there.
Review URL: http://codereview.chromium.org/2135011
TBR=jcivelli@chromium.org
Review URL: http://codereview.chromium.org/2077020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48044 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profile.cc')
| -rw-r--r-- | chrome/browser/profile.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc index eeeee11..505a528 100644 --- a/chrome/browser/profile.cc +++ b/chrome/browser/profile.cc @@ -766,7 +766,7 @@ void ProfileImpl::InitExtensions() { // Some sample apps to make our lives easier while we are developing extension // apps. This way we don't have to constantly install these over and over. - if (Extension::AppsAreEnabled()) { + if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableApps)) { #if defined(OS_WIN) std::string user_domain; if (base::EnvVarGetter::Create()->GetEnv("USERDOMAIN", &user_domain) && |