Move text_elider to gfx.

chrome/browser/ui/views/external_protocol_dialog.cc

 // Copyright (c) 2012 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 "chrome/browser/ui/views/external_protocol_dialog.h"
 
 #include "base/metrics/histogram.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/win/registry.h"
 #include "chrome/browser/external_protocol/external_protocol_handler.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/ui/views/constrained_window_views.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/base/text/text_elider.h"
+#include "ui/gfx/text_elider.h"
 #include "ui/views/controls/message_box_view.h"
 #include "ui/views/widget/widget.h"
 
 using content::WebContents;
 
 namespace {
 
 const int kMessageWidth = 400;
 
 }  // namespace
@@ skipping 95 matching lines @@
 ExternalProtocolDialog::ExternalProtocolDialog(WebContents* web_contents,
                                                const GURL& url,
                                                const std::wstring& command)
     : web_contents_(web_contents),
       url_(url),
       creation_time_(base::TimeTicks::Now()) {
   const int kMaxUrlWithoutSchemeSize = 256;
   const int kMaxCommandSize = 256;
   string16 elided_url_without_scheme;
   string16 elided_command;
-  ui::ElideString(ASCIIToUTF16(url.possibly_invalid_spec()),
+  gfx::ElideString(ASCIIToUTF16(url.possibly_invalid_spec()),
                   kMaxUrlWithoutSchemeSize, &elided_url_without_scheme);
-  ui::ElideString(WideToUTF16Hack(command), kMaxCommandSize, &elided_command);
+  gfx::ElideString(WideToUTF16Hack(command), kMaxCommandSize, &elided_command);
 
   string16 message_text = l10n_util::GetStringFUTF16(
       IDS_EXTERNAL_PROTOCOL_INFORMATION,
       ASCIIToUTF16(url.scheme() + ":"),
       elided_url_without_scheme) + ASCIIToUTF16("\n\n");
 
   message_text += l10n_util::GetStringFUTF16(
       IDS_EXTERNAL_PROTOCOL_APPLICATION_TO_LAUNCH,
       elided_command) + ASCIIToUTF16("\n\n");
 
@@ skipping 32 matching lines @@
   std::wstring parameters = url_spec.substr(split_offset + 1,
                                             url_spec.length() - 1);
   std::wstring application_to_launch;
   if (cmd_key.ReadValue(NULL, &application_to_launch) == ERROR_SUCCESS) {
     ReplaceSubstringsAfterOffset(&application_to_launch, 0, L"%1", parameters);
     return application_to_launch;
   } else {
     return std::wstring();
   }
 }