Move app/gfx/canvas and app/gfx/font to gfx/.

views/drag_utils_win.cc

 // Copyright (c) 2010 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 "views/drag_utils.h"
 
 #include <objidl.h>
 #include <shlobj.h>
 #include <shobjidl.h>
 
-#include "app/gfx/canvas.h"
 #include "app/os_exchange_data.h"
 #include "app/os_exchange_data_provider_win.h"
+#include "gfx/canvas.h"
 #include "gfx/gdi_util.h"
 
 namespace drag_utils {
 
 static void SetDragImageOnDataObject(HBITMAP hbitmap,
                                      const gfx::Size& size,
                                      const gfx::Point& cursor_offset,
                                      IDataObject* data_object) {
   IDragSourceHelper* helper = NULL;
   HRESULT rv = CoCreateInstance(CLSID_DragDropHelper, 0, CLSCTX_INPROC_SERVER,
@@ skipping 38 matching lines @@
   DCHECK(data_object && !size.IsEmpty());
   // SetDragImageOnDataObject(HBITMAP) takes ownership of the bitmap.
   HBITMAP bitmap = CreateBitmapFromCanvas(canvas, size.width(), size.height());
 
   // Attach 'bitmap' to the data_object.
   SetDragImageOnDataObject(bitmap, size, cursor_offset,
       OSExchangeDataProviderWin::GetIDataObject(*data_object));
 }
 
 } // namespace drag_utils