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

views/controls/label.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/label.h"
 
 #include <math.h>
 #include <limits>
 
-#include "app/gfx/canvas.h"
-#include "app/gfx/font.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/text_elider.h"
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
+#include "gfx/canvas.h"
 #include "gfx/color_utils.h"
+#include "gfx/font.h"
 #include "gfx/insets.h"
 #include "views/background.h"
 
 namespace views {
 
 // static
 const char Label::kViewClassName[] = "views/Label";
 SkColor Label::kEnabledColor, Label::kDisabledColor;
 
 static const int kFocusBorderPadding = 1;
@@ skipping 383 matching lines @@
 }
 
 gfx::Rect Label::GetAvailableRect() const {
   gfx::Rect bounds(gfx::Point(), size());
   gfx::Insets insets(GetInsets());
   bounds.Inset(insets.left(), insets.top(), insets.right(), insets.bottom());
   return bounds;
 }
 
 }  // namespace views