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

Side by Side Diff: content/shell/browser/shell_login_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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/shell/browser/shell_login_dialog.h" 5 #include "content/shell/browser/shell_login_dialog.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "content/public/browser/browser_thread.h" 10 #include "content/public/browser/browser_thread.h"
11 #include "content/public/browser/resource_dispatcher_host.h" 11 #include "content/public/browser/resource_dispatcher_host.h"
12 #include "net/base/auth.h" 12 #include "net/base/auth.h"
13 #include "net/url_request/url_request.h" 13 #include "net/url_request/url_request.h"
14 #include "ui/base/text/text_elider.h" 14 #include "ui/gfx/text_elider.h"
15 15
16 namespace content { 16 namespace content {
17 17
18 ShellLoginDialog::ShellLoginDialog( 18 ShellLoginDialog::ShellLoginDialog(
19 net::AuthChallengeInfo* auth_info, 19 net::AuthChallengeInfo* auth_info,
20 net::URLRequest* request) : auth_info_(auth_info), 20 net::URLRequest* request) : auth_info_(auth_info),
21 request_(request) { 21 request_(request) {
22 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 22 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
23 BrowserThread::PostTask( 23 BrowserThread::PostTask(
24 BrowserThread::UI, FROM_HERE, 24 BrowserThread::UI, FROM_HERE,
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 void ShellLoginDialog::PlatformCleanUp() {} 67 void ShellLoginDialog::PlatformCleanUp() {}
68 void ShellLoginDialog::PlatformRequestCancelled() {} 68 void ShellLoginDialog::PlatformRequestCancelled() {}
69 #endif 69 #endif
70 70
71 void ShellLoginDialog::PrepDialog(const string16& host, 71 void ShellLoginDialog::PrepDialog(const string16& host,
72 const string16& realm) { 72 const string16& realm) {
73 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 73 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
74 // The realm is controlled by the remote server, so there is no reason to 74 // The realm is controlled by the remote server, so there is no reason to
75 // believe it is of a reasonable length. 75 // believe it is of a reasonable length.
76 string16 elided_realm; 76 string16 elided_realm;
77 ui::ElideString(realm, 120, &elided_realm); 77 gfx::ElideString(realm, 120, &elided_realm);
78 78
79 string16 explanation = 79 string16 explanation =
80 ASCIIToUTF16("The server ") + host + 80 ASCIIToUTF16("The server ") + host +
81 ASCIIToUTF16(" requires a username and password."); 81 ASCIIToUTF16(" requires a username and password.");
82 82
83 if (!elided_realm.empty()) { 83 if (!elided_realm.empty()) {
84 explanation += ASCIIToUTF16(" The server says: "); 84 explanation += ASCIIToUTF16(" The server says: ");
85 explanation += elided_realm; 85 explanation += elided_realm;
86 explanation += ASCIIToUTF16("."); 86 explanation += ASCIIToUTF16(".");
87 } 87 }
(...skipping 10 matching lines...) Expand all
98 else 98 else
99 request_->CancelAuth(); 99 request_->CancelAuth();
100 ResourceDispatcherHost::Get()->ClearLoginDelegateForRequest(request_); 100 ResourceDispatcherHost::Get()->ClearLoginDelegateForRequest(request_);
101 101
102 BrowserThread::PostTask( 102 BrowserThread::PostTask(
103 BrowserThread::UI, FROM_HERE, 103 BrowserThread::UI, FROM_HERE,
104 base::Bind(&ShellLoginDialog::PlatformCleanUp, this)); 104 base::Bind(&ShellLoginDialog::PlatformCleanUp, this));
105 } 105 }
106 106
107 } // namespace content 107 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/web_contents/navigation_entry_impl.cc ('k') | printing/backend/print_backend.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698