Work on separate browser contexts

chrome/browser/ui/views/chrome_views_delegate.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/chrome_views_delegate.h"
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/event_disposition.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/views/accessibility/accessibility_event_router_views.h"
 #include "chrome/common/pref_names.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/screen.h"
-#include "ui/views/views_switches.h"
 #include "ui/views/widget/native_widget.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/app_icon_win.h"
 #endif
 
 #if defined(USE_AURA) && !defined(OS_CHROMEOS)
 #include "ui/views/widget/native_widget_aura.h"
 #include "ui/views/widget/desktop_native_widget_aura.h"
@@ skipping 108 matching lines @@
     views::Widget* widget) {
 #if defined(USE_ASH)
   return ash::Shell::GetInstance()->CreateDefaultNonClientFrameView(widget);
 #else
   return NULL;
 #endif
 }
 
 bool ChromeViewsDelegate::UseTransparentWindows() const {
 #if defined(USE_ASH)
-  // Ash uses transparent window frames above.
-  return !CommandLine::ForCurrentProcess()->HasSwitch(
-      views::switches::kDesktopAura);
+  // TODO(scottmg): http://crbug.com/133312. This needs context to determine
+  // if it's desktop or ash.
+#if defined(OS_CHROMEOS)
+  return true;
+#else
+  NOTIMPLEMENTED();
+  return false;
+#endif
 #else
   return false;
 #endif
 }
 
 void ChromeViewsDelegate::AddRef() {
   g_browser_process->AddRefModule();
 }
 
 void ChromeViewsDelegate::ReleaseRef() {
@@ skipping 22 matching lines @@
   return NULL;
 }
 
 views::NativeWidget* ChromeViewsDelegate::CreateNativeWidget(
     views::Widget::InitParams::Type type,
     views::internal::NativeWidgetDelegate* delegate,
     gfx::NativeView parent) {
 #if defined(USE_AURA) && !defined(OS_CHROMEOS)
   if (parent && type != views::Widget::InitParams::TYPE_MENU)
     return new views::NativeWidgetAura(delegate);
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-        views::switches::kDesktopAura))
+  if (parent && chrome::GetHostDesktopTypeForNativeView(parent) ==
+      chrome::HOST_DESKTOP_TYPE_NATIVE)
     return new views::DesktopNativeWidgetAura(delegate);
 #endif
   return NULL;
 }