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

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

Issue 9630002: Ash: Remove compact window mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: OpaqueBrowserFrameView, MultipleWindowIndicatorButton Created 8 years, 9 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 | « chrome/browser/ui/views/window.cc ('k') | chrome/browser/ui/window_snapshot/window_snapshot_aura.cc » ('j') | 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 2b9156e5a57952cc6b7c6ba72a6a2a4e8b2f4620..739fc61ebe4557ee56177e651e87cbfd3d433762 100644
--- a/chrome/browser/ui/webui/ntp/new_tab_ui.cc
+++ b/chrome/browser/ui/webui/ntp/new_tab_ui.cc
@@ -59,10 +59,6 @@
#include "chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.h"
#endif
-#if defined(USE_ASH)
-#include "ash/shell.h"
-#endif
-
using content::BrowserThread;
using content::RenderViewHost;
using content::UserMetricsAction;
@@ -298,10 +294,7 @@ bool NewTabUI::ShouldShowAppInstallHint() {
// static
bool NewTabUI::ShouldShowAppsPage() {
#if defined(USE_ASH)
- // Ash shows apps in app list thus should not show apps page in NTP4 unless
- // it is running in compact mode (crbug.com/116852).
- if (ash::Shell::HasInstance())
- return ash::Shell::GetInstance()->IsWindowModeCompact();
+ // Ash shows apps in app list thus should not show apps page in NTP4.
return false;
#else
return true;
« no previous file with comments | « chrome/browser/ui/views/window.cc ('k') | chrome/browser/ui/window_snapshot/window_snapshot_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698