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

views/controls/link.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/controls/link.h"
 
 #if defined(OS_LINUX)
 #include <gdk/gdk.h>
 #endif
 
-#include "app/gfx/font.h"
 #include "base/keyboard_codes.h"
 #include "base/logging.h"
 #include "gfx/color_utils.h"
+#include "gfx/font.h"
 #include "views/event.h"
 
 namespace {
 
 void GetColors(const SkColor* background_color,  // NULL means "use default"
                SkColor* highlighted_color,
                SkColor* disabled_color,
                SkColor* normal_color) {
   static SkColor kHighlightedColor, kDisabledColor, kNormalColor;
   static bool initialized = false;
@@ skipping 199 matching lines @@
       Label::SetFont(font.DeriveFont(0, font.style() | gfx::Font::UNDERLINED));
     Label::SetColor(highlighted_ ? highlighted_color_ : normal_color_);
   } else {
     if ((font.style() & gfx::Font::UNDERLINED) != 0)
       Label::SetFont(font.DeriveFont(0, font.style() & ~gfx::Font::UNDERLINED));
     Label::SetColor(disabled_color_);
   }
 }
 
 }  // namespace views