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

views/controls/menu/menu_item_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/controls/menu/menu_item_view.h"
 
-#include "app/gfx/canvas.h"
 #include "app/l10n_util.h"
+#include "gfx/canvas.h"
 #include "grit/app_strings.h"
 #include "views/controls/menu/menu_config.h"
 #include "views/controls/menu/menu_controller.h"
 #include "views/controls/menu/menu_separator.h"
 #include "views/controls/menu/submenu_view.h"
 
 namespace views {
 
 namespace {
 
@@ skipping 429 matching lines @@
 }
 
 int MenuItemView::GetBottomMargin() {
   MenuItemView* root = GetRootMenuItem();
   return root && root->has_icons_
       ? MenuConfig::instance().item_bottom_margin :
         MenuConfig::instance().item_no_icon_bottom_margin;
 }
 
 }  // namespace views