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

views/controls/menu/menu_config.h

 // Copyright (c) 2009 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.
 
 #ifndef VIEWS_CONTROLS_MENU_MENU_CONFIG_H_
 #define VIEWS_CONTROLS_MENU_MENU_CONFIG_H_
 
-#include "app/gfx/font.h"
+#include "gfx/font.h"
 
 namespace views {
 
 // Layout type information for menu items. Use the instance() method to obtain
 // the MenuConfig for the current platform.
 struct MenuConfig {
   MenuConfig() : item_top_margin(3),
                  item_bottom_margin(4),
                  item_no_icon_top_margin(1),
                  item_no_icon_bottom_margin(3),
@@ skipping 74 matching lines @@
 
  private:
   // Creates and configures a new MenuConfig as appropriate for the current
   // platform.
   static MenuConfig* Create();
 };
 
 }  // namespace views
 
 #endif  // VIEWS_CONTROLS_MENU_MENU_CONFIG_H_