chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_aura.cc - Issue 25108005: 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 25108005: linux_aura: Compile ash into chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix chromeos link Created 7 years, 3 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

« chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc ('K') | « chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc ('k') | chrome/chrome_browser_ui.gypi » ('j') | chrome/chrome_browser_ui.gypi » ('J')
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 0d9e8efc64205d94f5da6c4d5849c2e4dcdc7351..1c7a4af828c42d8ea0afa5a33b27425b161b0575 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

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

BrowserNonClientFrameView* CreateBrowserNonClientFrameView(

BrowserFrame* frame, BrowserView* browser_view) {

-#if defined(USE_AURA) && defined(OS_WIN)

+#if defined(USE_AURA)

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