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

views/window/custom_frame_view.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/window/custom_frame_view.h"
 
-#include "app/gfx/canvas.h"
-#include "app/gfx/font.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
 #if defined(OS_WIN)
 #include "app/win_util.h"
 #include "base/win_util.h"
 #endif
+#include "gfx/canvas.h"
+#include "gfx/font.h"
 #include "gfx/path.h"
 #include "grit/app_resources.h"
 #include "grit/app_strings.h"
 #include "views/window/client_view.h"
 #if defined(OS_LINUX)
 #include "views/window/hit_test.h"
 #endif
 #include "views/window/window_delegate.h"
 
 namespace views {
@@ skipping 548 matching lines @@
     title_font_ = new gfx::Font(win_util::GetWindowTitleFont());
 #elif defined(OS_LINUX)
     // TODO(ben): need to resolve what font this is.
     title_font_ = new gfx::Font();
 #endif
     initialized = true;
   }
 }
 
 }  // namespace views