OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "apps/app_shim/app_shim_mac.h" | 5 #include "apps/app_shim/app_shim_mac.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "chrome/common/chrome_switches.h" | 8 #include "chrome/common/chrome_switches.h" |
9 | 9 |
10 namespace apps { | 10 namespace apps { |
11 | 11 |
12 bool IsAppShimsEnabled() { | 12 bool IsAppShimsEnabled() { |
13 return !CommandLine::ForCurrentProcess()->HasSwitch( | 13 // Disable app shims in tests because shims created in ~/Applications will not |
14 switches::kDisableAppShims); | 14 // be cleaned up. |
| 15 return !(CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType) || |
| 16 CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableAppShims)); |
15 } | 17 } |
16 | 18 |
17 } // namespace apps | 19 } // namespace apps |
OLD | NEW |