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

Side by Side Diff: ash/system/web_notification/web_notification_tray_unittest.cc

Issue 2512783005: Fix //third_party/cec to not disable -Wunused-function. (Closed)
Patch Set: Rebase Created 4 years, 1 month 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
« no previous file with comments | « no previous file | chrome/browser/printing/print_preview_dialog_controller_browsertest.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/common/system/web_notification/web_notification_tray.h" 5 #include "ash/common/system/web_notification/web_notification_tray.h"
6 6
7 #include <utility> 7 #include <utility>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/common/material_design/material_design_controller.h" 10 #include "ash/common/material_design/material_design_controller.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 47
48 namespace ash { 48 namespace ash {
49 49
50 namespace { 50 namespace {
51 51
52 WebNotificationTray* GetTray() { 52 WebNotificationTray* GetTray() {
53 return StatusAreaWidgetTestHelper::GetStatusAreaWidget() 53 return StatusAreaWidgetTestHelper::GetStatusAreaWidget()
54 ->web_notification_tray(); 54 ->web_notification_tray();
55 } 55 }
56 56
57 #if defined(OS_CHROMEOS)
58
57 WebNotificationTray* GetSecondaryTray() { 59 WebNotificationTray* GetSecondaryTray() {
58 StatusAreaWidget* status_area_widget = 60 StatusAreaWidget* status_area_widget =
59 StatusAreaWidgetTestHelper::GetSecondaryStatusAreaWidget(); 61 StatusAreaWidgetTestHelper::GetSecondaryStatusAreaWidget();
60 if (status_area_widget) 62 if (status_area_widget)
61 return status_area_widget->web_notification_tray(); 63 return status_area_widget->web_notification_tray();
62 return NULL; 64 return NULL;
63 } 65 }
64 66
67 #endif
68
65 message_center::MessageCenter* GetMessageCenter() { 69 message_center::MessageCenter* GetMessageCenter() {
66 return GetTray()->message_center(); 70 return GetTray()->message_center();
67 } 71 }
68 72
69 SystemTray* GetSystemTray() { 73 SystemTray* GetSystemTray() {
70 return StatusAreaWidgetTestHelper::GetStatusAreaWidget()->system_tray(); 74 return StatusAreaWidgetTestHelper::GetStatusAreaWidget()->system_tray();
71 } 75 }
72 76
73 // Trivial item implementation for testing PopupAndSystemTray test case. 77 // Trivial item implementation for testing PopupAndSystemTray test case.
74 class TestItem : public SystemTrayItem { 78 class TestItem : public SystemTrayItem {
(...skipping 448 matching lines...) Expand 10 before | Expand all | Expand 10 after
523 EXPECT_FALSE(tray->is_active()); 527 EXPECT_FALSE(tray->is_active());
524 528
525 generator.ReleaseTouch(); 529 generator.ReleaseTouch();
526 EXPECT_FALSE(tray->is_active()); 530 EXPECT_FALSE(tray->is_active());
527 EXPECT_FALSE(tray->IsMessageCenterBubbleVisible()); 531 EXPECT_FALSE(tray->IsMessageCenterBubbleVisible());
528 } 532 }
529 533
530 #endif // OS_CHROMEOS 534 #endif // OS_CHROMEOS
531 535
532 } // namespace ash 536 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/printing/print_preview_dialog_controller_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698