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

Unified Diff: chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_aura.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
Index: chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_aura.cc
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_aura.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_aura.cc
index 72d68782c0f370ae307e4a112747257b9d2713ce..2625ca741ee0529e23cafc43851edb9ff78ed725 100644
--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_aura.cc
+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_aura.cc
@@ -4,15 +4,10 @@
#include "chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.h"
-#include "ash/shell.h"
-#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/panels/panel_browser_frame_view.h"
#include "chrome/browser/ui/panels/panel_browser_view.h"
#include "chrome/browser/ui/views/frame/app_non_client_frame_view_aura.h"
#include "chrome/browser/ui/views/frame/browser_view.h"
-#include "chrome/browser/ui/views/frame/compact_browser_frame_view.h"
-#include "chrome/browser/ui/views/frame/opaque_browser_frame_view.h"
-#include "chrome/browser/ui/views/frame/popup_non_client_frame_view.h"
namespace browser {
@@ -23,10 +18,6 @@ BrowserNonClientFrameView* CreateBrowserNonClientFrameView(
frame, static_cast<PanelBrowserView*>(browser_view));
}
- // Compact mode uses special opaque frames.
- if (ash::Shell::GetInstance()->IsWindowModeCompact())
- return new CompactBrowserFrameView(frame, browser_view);
-
// If this is an app window and it's maximized, use the special frame_view.
if (browser_view->browser()->is_app() && browser_view->IsMaximized())
return new AppNonClientFrameViewAura(frame, browser_view);
« no previous file with comments | « chrome/browser/ui/views/frame/browser_frame_aura.cc ('k') | chrome/browser/ui/views/frame/compact_browser_frame_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698