Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3560)

Unified Diff: chrome/browser/app_controller_mac.mm

Issue 23558007: Use apps::IsAppShimsEnabled instead of kEnableAppShims (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/app_controller_mac.mm
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm
index 214a6d59791ef4d5c8beae59537e234ed3177636..60d0e92e1240a815197d1e898747a2fb9fb3b78f 100644
--- a/chrome/browser/app_controller_mac.mm
+++ b/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
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698