Work on separate browser contexts

chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_aura.cc

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..57ed0298a7b854e0e117f14aa0fc5b346a8c3d8e 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
@@ -6,7 +6,6 @@
 
 #include "base/command_line.h"
 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view.h"
-#include "ui/views/views_switches.h"
 
 #if defined(USE_ASH)
 #include "chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.h"
@@ -22,8 +21,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);