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

Unified Diff: chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_aura.cc

Issue 9359022: Aura: Support hovering restore & close buttons for full screen apps (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove resources, as they've already been committed 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
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 6744f43bbdbe7278d3677235407d4d8bb8e07a14..26323dccf5def29bdebcf47870e615ffe4859c29 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
@@ -7,8 +7,10 @@
#include "ash/ash_switches.h"
#include "ash/shell.h"
#include "base/command_line.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"
@@ -29,6 +31,11 @@ BrowserNonClientFrameView* CreateBrowserNonClientFrameView(
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()->type() == Browser::TYPE_APP &&
+ browser_view->IsMaximized())
+ return new AppNonClientFrameViewAura(frame, browser_view);
+
return new OpaqueBrowserFrameView(frame, browser_view);
}

Powered by Google App Engine
This is Rietveld 408576698