chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_aura.cc - Issue 292443002: linux_aura: Compile ash into chrome.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 292443002: linux_aura: Compile ash into chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src

Patch Set: Rebase to ToT Created 6 years, 7 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_desktop_window_tree_host_x11.cc ('k') | chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | 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 2a4a3c6b33ea47d72ade846ed38130b5cc4c26f5..dd411c7477b556f6925bb02e146cf641315fe585 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

@@ -19,11 +19,13 @@ namespace chrome {

BrowserNonClientFrameView* CreateBrowserNonClientFrameView(

BrowserFrame* frame, BrowserView* browser_view) {

-#if defined(OS_WIN)

+#if defined(USE_AURA) && !defined(OS_CHROMEOS)

if (browser_view->browser()->

host_desktop_type() == chrome::HOST_DESKTOP_TYPE_NATIVE) {

+#if defined(OS_WIN)

if (frame->ShouldUseNativeFrame())

return new GlassBrowserFrameView(frame, browser_view);

+#endif

return new OpaqueBrowserFrameView(frame, browser_view);

}

#endif