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

app/win_util.h

 // Copyright (c) 2006-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 APP_WIN_UTIL_H_
 #define APP_WIN_UTIL_H_
 
 #include <objbase.h>
 
 #include <string>
 #include <vector>
 
-#include "app/gfx/font.h"
 #include "base/fix_wp64.h"
 #include "base/scoped_handle.h"
+#include "gfx/font.h"
 #include "gfx/rect.h"
 
 class FilePath;
 
 namespace win_util {
 
 // Import ScopedHandle and friends into this namespace for backwards
 // compatibility.  TODO(darin): clean this up!
 using ::ScopedHandle;
 using ::ScopedFindFileHandle;
@@ skipping 185 matching lines @@
 extern const int kAutoHideTaskbarThicknessPx;
 
 // Sets the application id given as the Application Model ID for the window
 // specified.  This method is used to insure that different web applications
 // do not group together on the Win7 task bar.
 void SetAppIdForWindow(const std::wstring& app_id, HWND hwnd);
 
 }  // namespace win_util
 
 #endif  // APP_WIN_UTIL_H_