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

Side by Side Diff: ash/system/chromeos/tray_display_unittest.cc

Issue 224113005: Eliminate ash::internal namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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/chromeos/tray_display.cc ('k') | ash/system/chromeos/tray_tracing.h » ('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 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"
11 #include "ash/system/tray/system_tray.h" 11 #include "ash/system/tray/system_tray.h"
12 #include "ash/test/ash_test_base.h" 12 #include "ash/test/ash_test_base.h"
13 #include "ash/test/test_system_tray_delegate.h" 13 #include "ash/test/test_system_tray_delegate.h"
14 #include "base/strings/string16.h" 14 #include "base/strings/string16.h"
15 #include "base/strings/utf_string_conversions.h" 15 #include "base/strings/utf_string_conversions.h"
16 #include "grit/ash_strings.h" 16 #include "grit/ash_strings.h"
17 #include "ui/accessibility/ax_view_state.h" 17 #include "ui/accessibility/ax_view_state.h"
18 #include "ui/base/l10n/l10n_util.h" 18 #include "ui/base/l10n/l10n_util.h"
19 #include "ui/gfx/display.h" 19 #include "ui/gfx/display.h"
20 #include "ui/message_center/message_center.h" 20 #include "ui/message_center/message_center.h"
21 #include "ui/message_center/notification.h" 21 #include "ui/message_center/notification.h"
22 #include "ui/message_center/notification_list.h" 22 #include "ui/message_center/notification_list.h"
23 #include "ui/views/controls/label.h" 23 #include "ui/views/controls/label.h"
24 24
25 namespace ash { 25 namespace ash {
26 namespace internal {
27 26
28 base::string16 GetTooltipText(const base::string16& headline, 27 base::string16 GetTooltipText(const base::string16& headline,
29 const base::string16& name1, 28 const base::string16& name1,
30 const std::string& data1, 29 const std::string& data1,
31 const base::string16& name2, 30 const base::string16& name2,
32 const std::string& data2) { 31 const std::string& data2) {
33 std::vector<base::string16> lines; 32 std::vector<base::string16> lines;
34 lines.push_back(headline); 33 lines.push_back(headline);
35 if (data1.empty()) { 34 if (data1.empty()) {
36 lines.push_back(name1); 35 lines.push_back(name1);
(...skipping 529 matching lines...) Expand 10 before | Expand all | Expand 10 after
566 UpdateDisplay("400x400,200x200/r"); 565 UpdateDisplay("400x400,200x200/r");
567 EXPECT_EQ( 566 EXPECT_EQ(
568 l10n_util::GetStringFUTF16( 567 l10n_util::GetStringFUTF16(
569 IDS_ASH_STATUS_TRAY_DISPLAY_ROTATED, 568 IDS_ASH_STATUS_TRAY_DISPLAY_ROTATED,
570 GetSecondDisplayName(), 569 GetSecondDisplayName(),
571 l10n_util::GetStringUTF16( 570 l10n_util::GetStringUTF16(
572 IDS_ASH_STATUS_TRAY_DISPLAY_ORIENTATION_90)), 571 IDS_ASH_STATUS_TRAY_DISPLAY_ORIENTATION_90)),
573 GetDisplayNotificationText()); 572 GetDisplayNotificationText());
574 } 573 }
575 574
576 } // namespace internal
577 } // namespace ash 575 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/chromeos/tray_display.cc ('k') | ash/system/chromeos/tray_tracing.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698