chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_aura.cc - Issue 11030017: Add context to gfx::Screen calls in support of simultaneous desktop+ash

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 11030017: Add context to gfx::Screen calls in support of simultaneous desktop+ash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: tidy Created 8 years, 2 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

« ash/display/display_controller.cc ('K') | « chrome/browser/ui/views/frame/browser_frame_aura.cc ('k') | chrome/browser/ui/views/fullscreen_exit_bubble_views.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 c229f640849987bb539c0e49c300d6396066a6f8..5515241041476375b8e27ba6cda232b378e48e9c 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

@@ -14,6 +14,7 @@

#endif

#if defined(OS_WIN)

+#include "chrome/browser/ui/ash/ash_init.h"

#include "chrome/browser/ui/views/frame/glass_browser_frame_view.h"

#endif

@@ -22,8 +23,8 @@ namespace chrome {

BrowserNonClientFrameView* CreateBrowserNonClientFrameView(

BrowserFrame* frame, BrowserView* browser_view) {

#if defined(USE_AURA)

- if (CommandLine::ForCurrentProcess()->HasSwitch(

- views::switches::kDesktopAura)) {

+ if (chrome::GetHostDesktopTypeForBrowser(browser_view->browser()) ==

+ chrome::HOST_DESKTOP_TYPE_NATIVE) {

#if defined(OS_WIN)

if (frame->ShouldUseNativeFrame())

return new GlassBrowserFrameView(frame, browser_view);