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

app/text_elider.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 <vector>
 
-#include "app/gfx/font.h"
 #include "app/text_elider.h"
 #include "app/l10n_util.h"
 #include "base/file_path.h"
 #include "base/i18n/rtl.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
+#include "gfx/font.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/escape.h"
 #include "net/base/net_util.h"
 #include "net/base/registry_controlled_domain.h"
 
 const wchar_t kEllipsis[] = L"\x2026";
 
 namespace gfx {
 
 // This function takes a GURL object and elides it. It returns a string
@@ skipping 389 matching lines @@
 string16 SortedDisplayURL::AfterHost() const {
   size_t slash_index = display_url_.find(sort_host_, prefix_end_);
   if (slash_index == string16::npos) {
     NOTREACHED();
     return string16();
   }
   return display_url_.substr(slash_index + sort_host_.length());
 }
 
 }  // namespace gfx.