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

Unified Diff: chrome/browser/ui/webui/ntp/new_tab_ui.cc

Issue 9602029: Show applications page in aura compact mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 10 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/ui/webui/ntp/new_tab_ui.cc
diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui.cc b/chrome/browser/ui/webui/ntp/new_tab_ui.cc
index c36ab5c93eb8b648fa04d93c0d408518f5a25199..05cade3bde87954ce88cf45d3346de7b7e6c0d6c 100644
--- a/chrome/browser/ui/webui/ntp/new_tab_ui.cc
+++ b/chrome/browser/ui/webui/ntp/new_tab_ui.cc
@@ -59,6 +59,10 @@
#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;
@@ -293,8 +297,9 @@ bool NewTabUI::ShouldShowAppInstallHint() {
// 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 if
Evan Stade 2012/03/05 22:17:33 for clarity: s/if we are not/unless it is
flackr 2012/03/05 22:56:46 Done.
+ // we are not running in compact mode (crbug.com/116852).
+ return ash::Shell::GetInstance()->IsWindowModeCompact();
#else
return true;
#endif
« 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