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

views/controls/menu/menu_scroll_view_container.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/menu/menu_scroll_view_container.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <uxtheme.h>
 #include <Vssym32.h>
 #endif
 
-#include "app/gfx/canvas.h"
+#include "gfx/canvas.h"
 #include "gfx/color_utils.h"
 #include "views/border.h"
 #include "views/controls/menu/menu_config.h"
 #include "views/controls/menu/menu_controller.h"
 #include "views/controls/menu/menu_item_view.h"
 #include "views/controls/menu/submenu_view.h"
 
 #if defined(OS_WIN)
 #include "gfx/native_theme_win.h"
 #endif
@@ skipping 201 matching lines @@
 }
 
 gfx::Size MenuScrollViewContainer::GetPreferredSize() {
   gfx::Size prefsize = scroll_view_->GetContents()->GetPreferredSize();
   gfx::Insets insets = GetInsets();
   prefsize.Enlarge(insets.width(), insets.height());
   return prefsize;
 }
 
 }  // namespace views