| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "chrome/browser/ui/ash/system_tray_delegate_chromeos.h" | 5 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "ash/display/display_manager.h" | 9 #include "ash/display/display_manager.h" |
| 10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 const ash::DateDefaultView* date_default_view = | 48 const ash::DateDefaultView* date_default_view = |
| 49 tray_date->GetDefaultViewForTesting(); | 49 tray_date->GetDefaultViewForTesting(); |
| 50 | 50 |
| 51 return date_default_view->GetDateView()->GetHourTypeForTesting(); | 51 return date_default_view->GetDateView()->GetHourTypeForTesting(); |
| 52 } | 52 } |
| 53 | 53 |
| 54 void CreateDefaultView() { | 54 void CreateDefaultView() { |
| 55 ash::TrayDate* tray_date = ash::Shell::GetInstance() | 55 ash::TrayDate* tray_date = ash::Shell::GetInstance() |
| 56 ->GetPrimarySystemTray() | 56 ->GetPrimarySystemTray() |
| 57 ->GetTrayDateForTesting(); | 57 ->GetTrayDateForTesting(); |
| 58 tray_date->CreateDefaultViewForTesting(ash::user::LOGGED_IN_NONE); | 58 tray_date->CreateDefaultViewForTesting(ash::LoginStatus::NOT_LOGGED_IN); |
| 59 } | 59 } |
| 60 | 60 |
| 61 } // namespace | 61 } // namespace |
| 62 | 62 |
| 63 class DisplayNotificationsTest : public InProcessBrowserTest { | 63 class DisplayNotificationsTest : public InProcessBrowserTest { |
| 64 public: | 64 public: |
| 65 DisplayNotificationsTest() {} | 65 DisplayNotificationsTest() {} |
| 66 ~DisplayNotificationsTest() override {} | 66 ~DisplayNotificationsTest() override {} |
| 67 | 67 |
| 68 void SetUp() override { InProcessBrowserTest::SetUp(); } | 68 void SetUp() override { InProcessBrowserTest::SetUp(); } |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 153 | 153 |
| 154 UpdateDisplay("400x400"); | 154 UpdateDisplay("400x400"); |
| 155 | 155 |
| 156 ui_test_utils::NavigateToURL(browser(), GURL("chrome://version")); | 156 ui_test_utils::NavigateToURL(browser(), GURL("chrome://version")); |
| 157 UpdateDisplay("400x400/r"); | 157 UpdateDisplay("400x400/r"); |
| 158 // Ensure that there is a notification that is shown. | 158 // Ensure that there is a notification that is shown. |
| 159 EXPECT_FALSE(GetVisibleNotifications().empty()); | 159 EXPECT_FALSE(GetVisibleNotifications().empty()); |
| 160 } | 160 } |
| 161 | 161 |
| 162 } // namespace chromeos | 162 } // namespace chromeos |
| OLD | NEW |