chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.cc - Issue 23731010: Move text_elider to gfx.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 23731010: Move text_elider to gfx. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Update3 Created 7 years, 3 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

« no previous file with comments | « chrome/browser/tab_contents/render_view_context_menu.cc ('k') | chrome/browser/ui/autofill/autofill_popup_controller_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.cc

diff --git a/chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.cc b/chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.cc

index 89fe155bd1e2fb9f1cb3d32c877a2e656788002a..c65a732ceba0cf96993196f6b6f54fb912404664 100644

--- a/chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.cc

+++ b/chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.cc

@@ -10,7 +10,7 @@

#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"

@@ -31,11 +31,11 @@ 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

@@ -44,10 +44,10 @@ void EnforceMaxPromptSize(const string16& in_string, string16* out_string) {

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