Revert 177182 - ViewTest.ChangeNativeViewHierarchyFindRoots failure

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/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)
-#include "ui/aura/root_window.h"
-#endif
-
 #if defined(USE_AURA) && !defined(OS_CHROMEOS)
 #include "chrome/browser/ui/host_desktop.h"
+#include "ui/aura/root_window.h"
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 #include "ui/views/widget/native_widget_aura.h"
 #endif
 
 #if defined(USE_ASH)
 #include "ash/shell.h"
 #include "chrome/browser/ui/ash/ash_init.h"
 #include "chrome/browser/ui/ash/ash_util.h"
 #endif
 
@@ skipping 127 matching lines @@
 
 content::WebContents* ChromeViewsDelegate::CreateWebContents(
     content::BrowserContext* browser_context,
     content::SiteInstance* site_instance) {
   return NULL;
 }
 
 void ChromeViewsDelegate::OnBeforeWidgetInit(
     views::Widget::InitParams* params,
     views::internal::NativeWidgetDelegate* delegate) {
+#if defined(USE_AURA) && !defined(OS_CHROMEOS)
   // If we already have a native_widget, we don't have to try to come
   // up with one.
   if (params->native_widget)
     return;
 
-#if defined(OS_CHROMEOS)
-  // When we are doing straight chromeos builds, we still need to handle the
-  // toplevel window case.
-  if (params->parent == NULL && params->context == NULL && params->top_level)
-    params->context = ash::Shell::GetPrimaryRootWindow();
-#elif defined(USE_AURA)
   // While the majority of the time, context wasn't plumbed through due to the
   // existence of a global StackingClient, if this window is a toplevel, it's
   // possible that there is no contextual state that we can use.
   if (params->parent == NULL && params->context == NULL && params->top_level) {
     // We need to make a decision about where to place this window based on the
     // desktop type.
     switch (chrome::GetActiveDesktop()) {
       case chrome::HOST_DESKTOP_TYPE_NATIVE:
         // If we're native, we should give this window its own toplevel desktop
         // widget.
@@ skipping 16 matching lines @@
     // should remove this check here.
     gfx::NativeView to_check =
         params->context ? params->context : params->parent;
     if (chrome::GetHostDesktopTypeForNativeView(to_check) ==
         chrome::HOST_DESKTOP_TYPE_NATIVE) {
       params->native_widget = new views::DesktopNativeWidgetAura(delegate);
     }
   }
 #endif
 }