Move text_elider to gfx.

chrome/browser/ui/app_modal_dialogs/javascript_app_modal_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/app_modal_dialogs/javascript_app_modal_dialog.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
-#include "ui/base/text/text_elider.h"
+#include "ui/gfx/text_elider.h"
 
 #if defined(USE_AURA)
 #include "ui/aura/root_window.h"
 #endif
 
 using content::JavaScriptDialogManager;
 using content::WebContents;
 
 namespace {
 
 // Control maximum sizes of various texts passed to us from javascript.
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 // Two-dimensional eliding.  Reformat the text of the message dialog
 // inserting line breaks because otherwise a single long line can overflow
 // the message dialog (and crash/hang the GTK, depending on the version).
 const int kMessageTextMaxRows = 32;
 const int kMessageTextMaxCols = 132;
 const int kDefaultPromptMaxRows = 24;
 const int kDefaultPromptMaxCols = 132;
 void EnforceMaxTextSize(const string16& in_string, string16* out_string) {
-  ui::ElideRectangleString(in_string, kMessageTextMaxRows,
+  gfx::ElideRectangleString(in_string, kMessageTextMaxRows,
                            kMessageTextMaxCols, false, out_string);
 }
 void EnforceMaxPromptSize(const string16& in_string, string16* out_string) {
-  ui::ElideRectangleString(in_string, kDefaultPromptMaxRows,
+  gfx::ElideRectangleString(in_string, kDefaultPromptMaxRows,
                            kDefaultPromptMaxCols, false, out_string);
 }
 #else
 // One-dimensional eliding.  Trust the window system to break the string
 // appropriately, but limit its overall length to something reasonable.
 const int kMessageTextMaxSize = 3000;
 const int kDefaultPromptMaxSize = 2000;
 void EnforceMaxTextSize(const string16& in_string, string16* out_string) {
-  ui::ElideString(in_string, kMessageTextMaxSize, out_string);
+  gfx::ElideString(in_string, kMessageTextMaxSize, out_string);
 }
 void EnforceMaxPromptSize(const string16& in_string, string16* out_string) {
-  ui::ElideString(in_string, kDefaultPromptMaxSize, out_string);
+  gfx::ElideString(in_string, kDefaultPromptMaxSize, out_string);
 }
 #endif
 
 }  // namespace
 
 ChromeJavaScriptDialogExtraData::ChromeJavaScriptDialogExtraData()
     : suppress_javascript_messages_(false) {
 }
 
 JavaScriptAppModalDialog::JavaScriptAppModalDialog(
@@ skipping 109 matching lines @@
   if (extra_data != extra_data_map_->end()) {
     extra_data->second.last_javascript_message_dismissal_ =
         base::TimeTicks::Now();
     extra_data->second.suppress_javascript_messages_ = suppress_js_messages;
   }
 
   // On Views, we can end up coming through this code path twice :(.
   // See crbug.com/63732.
   AppModalDialog::Invalidate();
 }