Move ui::GetAtom to gfx::GetAtom

ui/views/widget/desktop_aura/x11_desktop_handler.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 "ui/views/widget/desktop_aura/x11_desktop_handler.h"
 
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/x/x11_menu_list.h"
-#include "ui/base/x/x11_util.h"
 #include "ui/base/x/x11_window_event_manager.h"
 #include "ui/events/platform/platform_event_source.h"
+#include "ui/gfx/x/x11_atom_cache.h"
 #include "ui/gfx/x/x11_error_tracker.h"
 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h"
 
 namespace {
 
 // Our global instance. Deleted when our Env() is deleted.
 views::X11DesktopHandler* g_handler = NULL;
 
 }  // namespace
 
@@ skipping 55 matching lines @@
 
 bool X11DesktopHandler::CanDispatchEvent(const ui::PlatformEvent& event) {
   return event->type == CreateNotify || event->type == DestroyNotify ||
          (event->type == PropertyNotify &&
           event->xproperty.window == x_root_window_);
 }
 
 uint32_t X11DesktopHandler::DispatchEvent(const ui::PlatformEvent& event) {
   switch (event->type) {
     case PropertyNotify: {
-      if (event->xproperty.atom == ui::GetAtom("_NET_CURRENT_DESKTOP")) {
+      if (event->xproperty.atom == gfx::GetAtom("_NET_CURRENT_DESKTOP")) {
         if (UpdateWorkspace()) {
           for (views::X11DesktopHandlerObserver& observer : observers_)
             observer.OnWorkspaceChanged(workspace_);
         }
       }
       break;
     }
     case CreateNotify:
       OnWindowCreatedOrDestroyed(event->type, event->xcreatewindow.window);
       break;
@@ skipping 28 matching lines @@
     // The window might be destroyed if the message pump did not get a chance to
     // run but we can safely ignore the X error.
     gfx::X11ErrorTracker error_tracker;
     ui::XMenuList::GetInstance()->MaybeRegisterMenu(window);
   } else {
     ui::XMenuList::GetInstance()->MaybeUnregisterMenu(window);
   }
 }
 
 }  // namespace views