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

Side by Side Diff: ash/system/user/login_status.cc

Issue 15735027: Use a direct include of utf_string_conversions.h in android_webview/, apps/, ash/, base/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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
« no previous file with comments | « ash/system/tray/system_tray_unittest.cc ('k') | ash/system/user/tray_user.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ash/system/user/login_status.h" 5 #include "ash/system/user/login_status.h"
6 6
7 #include "ash/session_state_delegate.h" 7 #include "ash/session_state_delegate.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
11 #include "grit/ash_strings.h" 11 #include "grit/ash_strings.h"
12 #include "ui/base/resource/resource_bundle.h" 12 #include "ui/base/resource/resource_bundle.h"
13 13
14 namespace ash { 14 namespace ash {
15 namespace user { 15 namespace user {
16 16
17 base::string16 GetLocalizedSignOutStringForStatus(LoginStatus status, 17 base::string16 GetLocalizedSignOutStringForStatus(LoginStatus status,
18 bool multiline) { 18 bool multiline) {
19 int message_id; 19 int message_id;
20 switch (status) { 20 switch (status) {
(...skipping 21 matching lines...) Expand all
42 // framework does not evaluate escape sequences, the \n need to be explicitly 42 // framework does not evaluate escape sequences, the \n need to be explicitly
43 // handled. Depending on the value of |multiline|, actual line breaks or 43 // handled. Depending on the value of |multiline|, actual line breaks or
44 // spaces are substituted. 44 // spaces are substituted.
45 base::string16 newline = multiline ? ASCIIToUTF16("\n") : ASCIIToUTF16(" "); 45 base::string16 newline = multiline ? ASCIIToUTF16("\n") : ASCIIToUTF16(" ");
46 ReplaceSubstringsAfterOffset(&message, 0, ASCIIToUTF16("\\n"), newline); 46 ReplaceSubstringsAfterOffset(&message, 0, ASCIIToUTF16("\\n"), newline);
47 return message; 47 return message;
48 } 48 }
49 49
50 } // namespace user 50 } // namespace user
51 } // namespace ash 51 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/tray/system_tray_unittest.cc ('k') | ash/system/user/tray_user.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698