Use apps::IsAppShimsEnabled instead of kEnableAppShims

Currently the main menu is only modified for app windows when
--enable-app-shims is enabled. This change enables modifying
the main menu whenever app shims are enabled (i.e. when the app
launcher is enabled).

BUG=168080,276052

Review URL: https://chromiumcodereview.appspot.com/23558007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221974 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/app_controller_mac.mm

@@ -4,6 +4,7 @@
 
 #import "chrome/browser/app_controller_mac.h"
 
+#include "apps/app_shim/app_shim_mac.h"
 #include "apps/app_shim/extension_app_shim_handler_mac.h"
 #include "apps/shell_window_registry.h"
 #include "base/auto_reset.h"
@@ -643,7 +644,7 @@ class AppControllerProfileObserver : public ProfileInfoCacheObserver {
 
   // Start managing the menu for app windows. This needs to be done here because
   // main menu item titles are not yet initialized in awakeFromNib.
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableAppShims))
+  if (apps::IsAppShimsEnabled())
     appShimMenuController_.reset([[AppShimMenuController alloc] init]);
 
   // Build up the encoding menu, the order of the items differs based on the