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

views/controls/progress_bar.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/progress_bar.h"
 
 #include <string>
 
-#include "app/gfx/canvas.h"
-#include "app/gfx/font.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/logging.h"
 #include "base/string_util.h"
+#include "gfx/canvas.h"
 #include "gfx/color_utils.h"
+#include "gfx/font.h"
 #include "gfx/insets.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "third_party/skia/include/effects/SkBlurMaskFilter.h"
 #include "views/background.h"
 #include "views/border.h"
 #include "views/painter.h"
 
 namespace {
 
 // Corner radius for the progress bar's border.
@@ skipping 185 matching lines @@
     return false;
   *state = AccessibilityTypes::STATE_READONLY;
   return true;
 }
 
 void ProgressBar::SetAccessibleName(const std::wstring& name) {
   accessible_name_.assign(name);
 }
 
 }  // namespace views