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

views/controls/combobox/native_combobox_win.cc

 // 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.
 
 #include "views/controls/combobox/native_combobox_win.h"
 
 #include "app/combobox_model.h"
-#include "app/gfx/font.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/i18n/rtl.h"
+#include "gfx/font.h"
 #include "gfx/native_theme_win.h"
 #include "views/controls/combobox/combobox.h"
 #include "views/widget/widget.h"
 
 namespace views {
 
 // Limit how small a combobox can be.
 static const int kMinComboboxWidth = 148;
 
 // Add a couple extra pixels to the widths of comboboxes and combobox
@@ skipping 168 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // NativeComboboxWrapper, public:
 
 // static
 NativeComboboxWrapper* NativeComboboxWrapper::CreateWrapper(
     Combobox* combobox) {
   return new NativeComboboxWin(combobox);
 }
 
 }  // namespace views