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..14486ab5fafa34701375d9b7638d58a32ee22911 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"
@@ -21,13 +20,11 @@ namespace chrome {
 
 BrowserNonClientFrameView* CreateBrowserNonClientFrameView(
     BrowserFrame* frame, BrowserView* browser_view) {
-#if defined(USE_AURA)
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-        views::switches::kDesktopAura)) {
-#if defined(OS_WIN)
+#if defined(USE_AURA) && defined(OS_WIN)
+  if (chrome::GetHostDesktopTypeForBrowser(browser_view->browser()) ==
+      chrome::HOST_DESKTOP_TYPE_NATIVE) {
     if (frame->ShouldUseNativeFrame())
       return new GlassBrowserFrameView(frame, browser_view);
-#endif
     return new OpaqueBrowserFrameView(frame, browser_view);
   }
 #endif