Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(275)

Unified Diff: chrome/browser/ui/app_modal_dialogs/js_modal_dialog.cc

Issue 6257006: Move a bunch of random other files to src/ui/base... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/app_modal_dialogs/js_modal_dialog.cc
===================================================================
--- chrome/browser/ui/app_modal_dialogs/js_modal_dialog.cc (revision 71854)
+++ chrome/browser/ui/app_modal_dialogs/js_modal_dialog.cc (working copy)
@@ -4,7 +4,6 @@
#include "chrome/browser/ui/app_modal_dialogs/js_modal_dialog.h"
-#include "app/text_elider.h"
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/browser_shutdown.h"
@@ -14,6 +13,7 @@
#include "chrome/common/notification_service.h"
#include "chrome/common/notification_type.h"
#include "ipc/ipc_message.h"
+#include "ui/base/text/text_elider.h"
namespace {
@@ -43,11 +43,11 @@
// We trim the various parts of the message dialog because otherwise we can
// overflow the message dialog (and crash/hang the GTK+ version).
string16 elided_text;
- gfx::ElideRectangleString(WideToUTF16(message_text),
- kMessageTextMaxRows, kMessageTextMaxCols, &elided_text);
+ ui::ElideRectangleString(WideToUTF16(message_text),
+ kMessageTextMaxRows, kMessageTextMaxCols, &elided_text);
message_text_ = UTF16ToWide(elided_text);
- gfx::ElideString(default_prompt_text, kDefaultPromptTextSize,
- &default_prompt_text_);
+ ui::ElideString(default_prompt_text, kDefaultPromptTextSize,
+ &default_prompt_text_);
DCHECK((tab_contents_ != NULL) != (extension_host_ != NULL));
InitNotifications();
« no previous file with comments | « chrome/browser/themes/browser_theme_provider.h ('k') | chrome/browser/ui/app_modal_dialogs/message_box_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698