diff options
| author | jackhou@chromium.org <jackhou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-26 04:21:43 +0000 |
|---|---|---|
| committer | jackhou@chromium.org <jackhou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-26 04:21:43 +0000 |
| commit | 438b99bc730bc665eedfc62c4eb864c981e5c65f (patch) | |
| tree | e9a7a66df0ccd7fb7e550af853467d65a44966d1 /apps | |
| parent | 6c631614db1ae66e556c3bb618e5e2fa643cf813 (diff) | |
| download | chromium_src-438b99bc730bc665eedfc62c4eb864c981e5c65f.zip chromium_src-438b99bc730bc665eedfc62c4eb864c981e5c65f.tar.gz chromium_src-438b99bc730bc665eedfc62c4eb864c981e5c65f.tar.bz2 | |
Remove --disable-app-shims.
App shims have been enabled by default for 3 milestones
(since r242711).
BUG=350161
Review URL: https://codereview.chromium.org/298953002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272786 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_shim/app_shim.gypi | 2 | ||||
| -rw-r--r-- | apps/app_shim/app_shim_mac.cc | 19 | ||||
| -rw-r--r-- | apps/app_shim/app_shim_mac.h | 15 |
3 files changed, 0 insertions, 36 deletions
diff --git a/apps/app_shim/app_shim.gypi b/apps/app_shim/app_shim.gypi index 8d20603..3f402f7 100644 --- a/apps/app_shim/app_shim.gypi +++ b/apps/app_shim/app_shim.gypi @@ -24,8 +24,6 @@ 'app_shim_host_mac.h', 'app_shim_host_manager_mac.h', 'app_shim_host_manager_mac.mm', - 'app_shim_mac.cc', - 'app_shim_mac.h', 'chrome_main_app_mode_mac.mm', 'extension_app_shim_handler_mac.cc', 'extension_app_shim_handler_mac.h', diff --git a/apps/app_shim/app_shim_mac.cc b/apps/app_shim/app_shim_mac.cc deleted file mode 100644 index a809fa7..0000000 --- a/apps/app_shim/app_shim_mac.cc +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright 2013 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. - -#include "apps/app_shim/app_shim_mac.h" - -#include "base/command_line.h" -#include "chrome/common/chrome_switches.h" - -namespace apps { - -bool IsAppShimsEnabled() { - // Disable app shims in tests because shims created in ~/Applications will not - // be cleaned up. - return !(CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType) || - CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableAppShims)); -} - -} // namespace apps diff --git a/apps/app_shim/app_shim_mac.h b/apps/app_shim/app_shim_mac.h deleted file mode 100644 index 1b0068c..0000000 --- a/apps/app_shim/app_shim_mac.h +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright 2013 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. - -#ifndef APPS_APP_SHIM_APP_SHIM_MAC_H_ -#define APPS_APP_SHIM_APP_SHIM_MAC_H_ - -namespace apps { - -// Returns whether the app shims are enabled. -bool IsAppShimsEnabled(); - -} // namespace apps - -#endif // APPS_APP_SHIM_APP_SHIM_MAC_H_ |