diff options
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/extensions/extension.cc | 4 | ||||
| -rw-r--r-- | chrome/common/extensions/extension_manifests_unittest.cc | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc index 8736c79..4a6bac3 100644 --- a/chrome/common/extensions/extension.cc +++ b/chrome/common/extensions/extension.cc @@ -934,9 +934,7 @@ bool Extension::AppsAreEnabled() { #if defined(OS_CHROMEOS) return true; #else - static bool apps_enabled_mode = - CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableApps); - return apps_enabled_mode; + return CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableApps); #endif } diff --git a/chrome/common/extensions/extension_manifests_unittest.cc b/chrome/common/extensions/extension_manifests_unittest.cc index a92bdf5..f1e59c3 100644 --- a/chrome/common/extensions/extension_manifests_unittest.cc +++ b/chrome/common/extensions/extension_manifests_unittest.cc @@ -44,8 +44,7 @@ class ManifestTest : public testing::Test { scoped_ptr<Extension> extension(new Extension(path.DirName())); extension->set_location(location); - if (enable_apps_) - extension->set_apps_enabled(true); + extension->set_apps_enabled(enable_apps_); if (!extension->InitFromValue(*value, false, error)) return NULL; |