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

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

Issue 9618022: Ash: Use translucent frames by default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: leak in CustomFrameViewAsh 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/frame/browser_frame.cc ('k') | chrome/browser/ui/views/window.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 fdbe8818f50f323f33f2a4ad62caa27993722593..72d68782c0f370ae307e4a112747257b9d2713ce 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,9 +4,7 @@
#include "chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.h"
-#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"
@@ -24,6 +22,8 @@ BrowserNonClientFrameView* CreateBrowserNonClientFrameView(
return new PanelBrowserFrameView(
frame, static_cast<PanelBrowserView*>(browser_view));
}
+
+ // Compact mode uses special opaque frames.
if (ash::Shell::GetInstance()->IsWindowModeCompact())
return new CompactBrowserFrameView(frame, browser_view);
@@ -31,15 +31,11 @@ BrowserNonClientFrameView* CreateBrowserNonClientFrameView(
if (browser_view->browser()->is_app() && browser_view->IsMaximized())
return new AppNonClientFrameViewAura(frame, browser_view);
- CommandLine* command_line = CommandLine::ForCurrentProcess();
- if (command_line->HasSwitch(ash::switches::kAuraTranslucentFrames)) {
- BrowserNonClientFrameViewAura* frame_view =
- new BrowserNonClientFrameViewAura(frame, browser_view);
- frame_view->Init();
- return frame_view;
- }
-
- return new OpaqueBrowserFrameView(frame, browser_view);
+ // Default is potentially translucent fancy frames.
+ BrowserNonClientFrameViewAura* frame_view =
+ new BrowserNonClientFrameViewAura(frame, browser_view);
+ frame_view->Init();
+ return frame_view;
}
} // namespace browser
« no previous file with comments | « chrome/browser/ui/views/frame/browser_frame.cc ('k') | chrome/browser/ui/views/window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698