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

views/controls/button/menu_button.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/button/menu_button.h"
 
 #include "app/drag_drop_types.h"
-#include "app/gfx/canvas.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
+#include "gfx/canvas.h"
 #include "grit/app_strings.h"
 #include "grit/app_resources.h"
 #include "views/controls/button/button.h"
 #include "views/controls/menu/view_menu_delegate.h"
 #include "views/event.h"
 #include "views/screen.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
 #include "views/window/window.h"
 
@@ skipping 226 matching lines @@
 
   *state = AccessibilityTypes::STATE_HASPOPUP;
   return true;
 }
 
 std::string MenuButton::GetClassName() const {
   return kViewClassName;
 }
 
 }  // namespace views