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

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: Fix browser_test 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 | « chrome/browser/ui/views/frame/browser_frame_aura.cc ('k') | chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 178db2f682f2445b21e9c4b4851bd4154707b49b..f57eebf440bad9622cb5db163537499af084720b 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,10 @@ BrowserNonClientFrameView* CreateBrowserNonClientFrameView(
if (command_line->HasSwitch(ash::switches::kAuraTranslucentFrames))
return new BrowserNonClientFrameViewAura(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);
+
return new OpaqueBrowserFrameView(frame, browser_view);
}
« no previous file with comments | « chrome/browser/ui/views/frame/browser_frame_aura.cc ('k') | chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698