Rename Desktop->RootWindow.

ui/views/controls/menu/menu_controller.cc

 // Copyright (c) 2011 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 "ui/views/controls/menu/menu_controller.h"
 
 #include "base/i18n/case_conversion.h"
 #include "base/i18n/rtl.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/events.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/menu/menu_controller_delegate.h"
 #include "ui/views/controls/menu/menu_scroll_view_container.h"
 #include "ui/views/controls/menu/submenu_view.h"
 #include "ui/views/drag_utils.h"
 #include "ui/views/view_constants.h"
 #include "ui/views/views_delegate.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(USE_AURA)
-#include "ui/aura/desktop.h"
+#include "ui/aura/root_window.h"
 #elif defined(TOOLKIT_USES_GTK)
 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h"
 #endif
 
 using base::Time;
 using base::TimeDelta;
 using ui::OSExchangeData;
 
 // Period of the scroll timer (in milliseconds).
 static const int kScrollTimerMS = 30;
@@ skipping 838 matching lines @@
     MenuController::Dispatch(base::wayland::WaylandEvent* ev) {
   return exit_type_ != EXIT_NONE ?
       base::MessagePumpDispatcher::EVENT_QUIT :
       base::MessagePumpDispatcher::EVENT_PROCESSED;
 }
 
 #elif defined(USE_AURA)
 base::MessagePumpDispatcher::DispatchStatus
     MenuController::Dispatch(XEvent* xev) {
   if (exit_type_ == EXIT_ALL || exit_type_ == EXIT_DESTROYED) {
-    aura::Desktop::GetInstance()->GetDispatcher()->Dispatch(xev);
+    aura::RootWindow::GetInstance()->GetDispatcher()->Dispatch(xev);
     return base::MessagePumpDispatcher::EVENT_QUIT;
   }
   switch (ui::EventTypeFromNative(xev)) {
     case ui::ET_KEY_PRESSED:
       OnKeyDown(ui::KeyboardCodeFromNative(xev));
       // OnKeyDown may have set exit_type_.
       if (exit_type_ != EXIT_NONE)
         return base::MessagePumpDispatcher::EVENT_QUIT;
 
       // TODO(oshima): support SelectChar
       break;
     case ui::ET_KEY_RELEASED:
       return base::MessagePumpDispatcher::EVENT_PROCESSED;
     default:
       break;
   }
 
   // TODO(oshima): Update Windows' Dispatcher to return DispatchStatus
   // instead of bool.
-  if (aura::Desktop::GetInstance()->GetDispatcher()->Dispatch(xev) ==
+  if (aura::RootWindow::GetInstance()->GetDispatcher()->Dispatch(xev) ==
       base::MessagePumpDispatcher::EVENT_IGNORED)
     return EVENT_IGNORED;
   return exit_type_ != EXIT_NONE ?
       base::MessagePumpDispatcher::EVENT_QUIT :
       base::MessagePumpDispatcher::EVENT_PROCESSED;
 }
 #else
 bool MenuController::Dispatch(GdkEvent* event) {
   if (exit_type_ == EXIT_ALL || exit_type_ == EXIT_DESTROYED) {
     gtk_main_do_event(event);
@@ skipping 1022 matching lines @@
 }
 
 void MenuController::SetExitType(ExitType type) {
   exit_type_ = type;
 #if defined(USE_AURA)
   // On aura, closing menu may not trigger next native event, which
   // is necessary to exit from nested loop (See Dispatch methods).
   // Send non-op event so that Dispatch method will always be called.
   // crbug.com/104684.
   if (exit_type_ == EXIT_ALL || exit_type_ == EXIT_DESTROYED)
-    aura::Desktop::GetInstance()->PostNativeEvent(ui::CreateNoopEvent());
+    aura::RootWindow::GetInstance()->PostNativeEvent(ui::CreateNoopEvent());
 #endif
 }
 
 
 }  // namespace views