Merge 48149 - Relanding 48042....

chrome/browser/views/bookmark_bar_view.cc

Index: chrome/browser/views/bookmark_bar_view.cc
===================================================================
--- chrome/browser/views/bookmark_bar_view.cc	(revision 48200)
+++ chrome/browser/views/bookmark_bar_view.cc	(working copy)
@@ -33,7 +33,6 @@
 #include "chrome/browser/views/event_utils.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/views/location_bar/location_bar_view.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/page_transition_types.h"
 #include "chrome/common/pref_names.h"
@@ -462,10 +461,8 @@
 
 gfx::Size BookmarkBarView::GetPreferredSize() {
   // We don't want the bookmark bar view in the app launcher new tab page.
-  static bool extension_apps = CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableApps);
-  bool hide_bookmark_bar = (extension_apps && OnNewTabPage()) ||
-                           OnAppsPage();
+  bool hide_bookmark_bar =
+      (Extension::AppsAreEnabled() && OnNewTabPage()) || OnAppsPage();
 
   if (!hide_bookmark_bar)
     return LayoutItems(true);