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

app/resource_bundle_dummy.cc

 // Copyright (c) 2006-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 "app/resource_bundle.h"
 
 #include <windows.h>
 
-#include "app/gfx/font.h"
 #include "base/logging.h"
 #include "base/win_util.h"
+#include "gfx/font.h"
 
 ResourceBundle* ResourceBundle::g_shared_instance_ = NULL;
 
 // NOTE(gregoryd): This is a hack to avoid creating more nacl_win64-specific
 // files. The font members of ResourceBundle are never initialized in our code
 // so this destructor is never called.
 namespace gfx {
   Font::HFontRef::~HFontRef() {
     NOTREACHED();
   }
@@ skipping 28 matching lines @@
       locale_resources_data_(NULL) {
 }
 
 ResourceBundle::~ResourceBundle() {
 }
 
 
 string16 ResourceBundle::GetLocalizedString(int message_id) {
   return std::wstring();
 }