Merge 48149 - Relanding 48042....

chrome/browser/dom_ui/new_tab_ui.cc

 // Copyright (c) 2006-2009 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 "build/build_config.h"
 
 #include "chrome/browser/dom_ui/new_tab_ui.h"
 
 #include <set>
 
@@ skipping 487 matching lines @@
   if (!GetProfile()->IsOffTheRecord()) {
     AddMessageHandler((new ShownSectionsHandler())->Attach(this));
     AddMessageHandler((new MostVisitedHandler())->Attach(this));
     AddMessageHandler((new RecentlyClosedTabsHandler())->Attach(this));
     AddMessageHandler((new MetricsHandler())->Attach(this));
     if (WebResourcesEnabled())
       AddMessageHandler((new TipsHandler())->Attach(this));
     if (ProfileSyncService::IsSyncEnabled()) {
       AddMessageHandler((new NewTabPageSyncHandler())->Attach(this));
     }
-    if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableApps)) {
+    if (Extension::AppsAreEnabled()) {
       ExtensionsService* service = GetProfile()->GetExtensionsService();
-      AddMessageHandler((new AppLauncherHandler(service))->Attach(this));
+      // We might not have an ExtensionsService (on ChromeOS when not logged in
+      // for example).
+      if (service)
+        AddMessageHandler((new AppLauncherHandler(service))->Attach(this));
     }
 
     AddMessageHandler((new NewTabPageSetHomePageHandler())->Attach(this));
     AddMessageHandler((new PromotionalMessageHandler())->Attach(this));
   }
 
   // Initializing the CSS and HTML can require some CPU, so do it after
   // we've hooked up the most visited handler.  This allows the DB query
   // for the new tab thumbs to happen earlier.
   InitializeCSSCaches();
@@ skipping 164 matching lines @@
     // URL from the new tab page, but in any case it's an error.
     NOTREACHED();
     return;
   }
 
   scoped_refptr<RefCountedBytes> html_bytes =
       profile_->GetNTPResourceCache()->GetNewTabHTML(is_off_the_record);
 
   SendResponse(request_id, html_bytes);
 }