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

app/text_elider.h

 // Copyright (c) 2006-2008 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 APP_GFX_TEXT_ELIDER_H_
 #define APP_GFX_TEXT_ELIDER_H_
 
 #include <unicode/coll.h>
 #include <unicode/uchar.h>
 
-#include "app/gfx/font.h"
 #include "base/basictypes.h"
 #include "base/string16.h"
+#include "gfx/font.h"
 
 class FilePath;
 class GURL;
 
 // TODO(port): this file should deal in string16s rather than wstrings.
 namespace gfx {
 
 // This function takes a GURL object and elides it. It returns a string
 // which composed of parts from subdomain, domain, path, filename and query.
 // A "..." is added automatically at the end if the elided string is bigger
@@ skipping 54 matching lines @@
 
   // End of the prefix (spec and separator) in display_url_.
   size_t prefix_end_;
 
   string16 display_url_;
 };
 
 } // namespace gfx.
 
 #endif  // APP_GFX_TEXT_ELIDER_H_