Move ui::GetAtom to gfx::GetAtom

ui/base/x/selection_requestor.cc

 // Copyright (c) 2013 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/base/x/selection_requestor.h"
 
 #include <algorithm>
 #include <X11/Xlib.h>
 
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "ui/base/x/selection_utils.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/events/platform/platform_event_dispatcher.h"
 #include "ui/events/platform/platform_event_source.h"
+#include "ui/gfx/x/x11_atom_cache.h"
 #include "ui/gfx/x/x11_types.h"
 
 namespace ui {
 
 namespace {
 
 const char kChromeSelection[] = "CHROME_SELECTION";
 const char kIncr[] = "INCR";
 
 // The period of |abort_timer_|. Arbitrary but must be <= than
@@ skipping 29 matching lines @@
 }  // namespace
 
 SelectionRequestor::SelectionRequestor(XDisplay* x_display,
                                        XID x_window,
                                        PlatformEventDispatcher* dispatcher)
     : x_display_(x_display),
       x_window_(x_window),
       x_property_(None),
       dispatcher_(dispatcher),
       current_request_index_(0u) {
-  x_property_ = GetAtom(kChromeSelection);
+  x_property_ = gfx::GetAtom(kChromeSelection);
 }
 
 SelectionRequestor::~SelectionRequestor() {}
 
 bool SelectionRequestor::PerformBlockingConvertSelection(
     XAtom selection,
     XAtom target,
     scoped_refptr<base::RefCountedMemory>* out_data,
     size_t* out_data_items,
     XAtom* out_type) {
@@ skipping 79 matching lines @@
                                         &request->out_data_items,
                                         &request->out_type);
     if (success) {
       request->out_data.clear();
       request->out_data.push_back(out_data);
     }
   }
   if (event_property != None)
     XDeleteProperty(x_display_, x_window_, event_property);
 
-  if (request->out_type == GetAtom(kIncr)) {
+  if (request->out_type == gfx::GetAtom(kIncr)) {
     request->data_sent_incrementally = true;
     request->out_data.clear();
     request->out_data_items = 0u;
     request->out_type = None;
     request->timeout = base::TimeTicks::Now() +
         base::TimeDelta::FromMilliseconds(kRequestTimeoutMs);
   } else {
     CompleteRequest(current_request_index_, success);
   }
 }
@@ skipping 129 matching lines @@
       out_type(None),
       success(false),
       timeout(timeout),
       completed(false) {
 }
 
 SelectionRequestor::Request::~Request() {
 }
 
 }  // namespace ui