Show applications page in aura compact mode.

chrome/browser/ui/webui/ntp/new_tab_ui.cc

 // Copyright (c) 2012 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/ui/webui/ntp/new_tab_ui.h"
 
 #include <set>
 
@@ skipping 41 matching lines @@
 #include "content/public/browser/web_ui.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if !defined(OS_ANDROID)
 #include "chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.h"
 #endif
 
+#if defined(USE_AURA)
+#include "ash/shell.h"
+#endif
+
 using content::BrowserThread;
 using content::UserMetricsAction;
 using content::WebContents;
 using content::WebUIController;
 
 namespace {
 
 // The amount of time there must be no painting for us to consider painting
 // finished.  Observed times are in the ~1200ms range on Windows.
 const int kTimeoutMs = 2000;
@@ skipping 214 matching lines @@
 // static
 bool NewTabUI::ShouldShowAppInstallHint() {
   const CommandLine* cli = CommandLine::ForCurrentProcess();
   return cli->HasSwitch(switches::kNtpAppInstallHint) ||
       WebStoreLinkExperimentGroupIs(g_hint_group);
 }
 
 // static
 bool NewTabUI::ShouldShowAppsPage() {
 #if defined(USE_AURA)
-  // Ash shows apps in app list thus should not show apps page in NTP4.
-  return false;
+  // Ash shows apps in app list thus should not show apps page in NTP4 unless
+  // it is running in compact mode (crbug.com/116852).
+  return ash::Shell::GetInstance()->IsWindowModeCompact();
 #else
   return true;
 #endif
 }
 
 // static
 bool NewTabUI::IsSuggestionsPageEnabled() {
   return CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableSuggestionsTabPage);
 }
@@ skipping 98 matching lines @@
 }
 
 void NewTabUI::NewTabHTMLSource::AddResource(const char* resource,
                                              const char* mime_type,
                                              int resource_id) {
   DCHECK(resource);
   DCHECK(mime_type);
   resource_map_[std::string(resource)] =
       std::make_pair(std::string(mime_type), resource_id);
 }