Move native_widget_types and gtk_native_view_id_manager from base/gfx to...

app/gfx/gtk_native_view_id_manager.h

 // Copyright (c) 2009 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.
 
-#ifndef BASE_GFX_GTK_NATIVE_VIEW_ID_MANAGER_H_
-#define BASE_GFX_GTK_NATIVE_VIEW_ID_MANAGER_H_
+#ifndef APP_GFX_GTK_NATIVE_VIEW_ID_MANAGER_H_
+#define APP_GFX_GTK_NATIVE_VIEW_ID_MANAGER_H_
 
 #include <map>
 
+#include "app/gfx/native_widget_types.h"
 #include "base/singleton.h"
-#include "base/gfx/native_widget_types.h"
 
 typedef unsigned long XID;
 
 // NativeViewIds are the opaque values which the renderer holds as a reference
 // to a window. These ids are often used in sync calls from the renderer and
 // one cannot terminate sync calls on the UI thread as that can lead to
 // deadlocks.
 //
 // Because of this, we have the BACKGROUND_X11 thread for these calls and this
 // thread has a separate X connection in order to answer them. But one cannot
@@ skipping 59 matching lines @@
   // protects native_view_to_id_ and id_to_info_
   Lock lock_;
     // If asked for an id for the same widget twice, we want to return the same
     // id. So this records the current mapping.
     std::map<gfx::NativeView, gfx::NativeViewId> native_view_to_id_;
     std::map<gfx::NativeViewId, NativeViewInfo> id_to_info_;
 
   DISALLOW_COPY_AND_ASSIGN(GtkNativeViewManager);
 };
 
-#endif  // BASE_GFX_GTK_NATIVE_VIEW_ID_MANAGER_H_
+#endif  // APP_GFX_GTK_NATIVE_VIEW_ID_MANAGER_H_