Index: ui/base/text/text_elider.cc |
=================================================================== |
--- ui/base/text/text_elider.cc (revision 0) |
+++ ui/base/text/text_elider.cc (working copy) |
@@ -1,10 +1,11 @@ |
-// Copyright (c) 2010 The Chromium Authors. All rights reserved. |
+// Copyright (c) 2011 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/text_elider.h" |
+#include "ui/base/text/text_elider.h" |
+ |
#include "base/file_path.h" |
#include "base/i18n/break_iterator.h" |
#include "base/i18n/char_iterator.h" |
@@ -19,6 +20,7 @@ |
#include "net/base/net_util.h" |
#include "net/base/registry_controlled_domain.h" |
+namespace ui { |
namespace { |
@@ -47,8 +49,6 @@ |
} // namespace |
-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 |
@@ -662,5 +662,4 @@ |
return rect.Finalize(); |
} |
-} // namespace gfx |
- |
+} // namespace ui |