OLD | NEW |
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 "ash/system/chromeos/tray_display.h" | 5 #include "ash/system/chromeos/tray_display.h" |
6 | 6 |
7 #include "ash/display/display_manager.h" | 7 #include "ash/display/display_manager.h" |
8 #include "ash/root_window_controller.h" | 8 #include "ash/root_window_controller.h" |
9 #include "ash/screen_util.h" | 9 #include "ash/screen_util.h" |
10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
(...skipping 28 matching lines...) Expand all Loading... |
39 } else { | 39 } else { |
40 lines.push_back(l10n_util::GetStringFUTF16( | 40 lines.push_back(l10n_util::GetStringFUTF16( |
41 IDS_ASH_STATUS_TRAY_DISPLAY_SINGLE_DISPLAY, | 41 IDS_ASH_STATUS_TRAY_DISPLAY_SINGLE_DISPLAY, |
42 name1, base::UTF8ToUTF16(data1))); | 42 name1, base::UTF8ToUTF16(data1))); |
43 } | 43 } |
44 if (!name2.empty()) { | 44 if (!name2.empty()) { |
45 lines.push_back(l10n_util::GetStringFUTF16( | 45 lines.push_back(l10n_util::GetStringFUTF16( |
46 IDS_ASH_STATUS_TRAY_DISPLAY_SINGLE_DISPLAY, | 46 IDS_ASH_STATUS_TRAY_DISPLAY_SINGLE_DISPLAY, |
47 name2, base::UTF8ToUTF16(data2))); | 47 name2, base::UTF8ToUTF16(data2))); |
48 } | 48 } |
49 return JoinString(lines, '\n'); | 49 return base::JoinString(lines, base::ASCIIToUTF16("\n")); |
50 } | 50 } |
51 | 51 |
52 base::string16 GetMirroredTooltipText(const base::string16& headline, | 52 base::string16 GetMirroredTooltipText(const base::string16& headline, |
53 const base::string16& name, | 53 const base::string16& name, |
54 const std::string& data) { | 54 const std::string& data) { |
55 return GetTooltipText(headline, name, data, base::string16(), ""); | 55 return GetTooltipText(headline, name, data, base::string16(), ""); |
56 } | 56 } |
57 | 57 |
58 base::string16 GetFirstDisplayName() { | 58 base::string16 GetFirstDisplayName() { |
59 DisplayManager* display_manager = Shell::GetInstance()->display_manager(); | 59 DisplayManager* display_manager = Shell::GetInstance()->display_manager(); |
(...skipping 531 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
591 // rotate the second. | 591 // rotate the second. |
592 UpdateDisplay("400x400,200x200/r"); | 592 UpdateDisplay("400x400,200x200/r"); |
593 EXPECT_EQ(l10n_util::GetStringFUTF16( | 593 EXPECT_EQ(l10n_util::GetStringFUTF16( |
594 IDS_ASH_STATUS_TRAY_DISPLAY_ROTATED, GetSecondDisplayName(), | 594 IDS_ASH_STATUS_TRAY_DISPLAY_ROTATED, GetSecondDisplayName(), |
595 l10n_util::GetStringUTF16( | 595 l10n_util::GetStringUTF16( |
596 IDS_ASH_STATUS_TRAY_DISPLAY_ORIENTATION_90)), | 596 IDS_ASH_STATUS_TRAY_DISPLAY_ORIENTATION_90)), |
597 GetDisplayNotificationAdditionalText()); | 597 GetDisplayNotificationAdditionalText()); |
598 } | 598 } |
599 | 599 |
600 } // namespace ash | 600 } // namespace ash |
OLD | NEW |