| 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" |
| 11 #include "ash/system/date/date_default_view.h" | 11 #include "ash/system/date/date_default_view.h" |
| 12 #include "ash/system/date/date_view.h" | 12 #include "ash/system/date/date_view.h" |
| 13 #include "ash/system/date/tray_date.h" | 13 #include "ash/system/date/tray_date.h" |
| 14 #include "ash/test/display_manager_test_api.h" | 14 #include "ash/test/display_manager_test_api.h" |
| 15 #include "base/macros.h" | 15 #include "base/macros.h" |
| 16 #include "base/prefs/pref_service.h" | |
| 17 #include "chrome/browser/chromeos/login/login_manager_test.h" | 16 #include "chrome/browser/chromeos/login/login_manager_test.h" |
| 18 #include "chrome/browser/chromeos/login/session/user_session_manager.h" | 17 #include "chrome/browser/chromeos/login/session/user_session_manager.h" |
| 19 #include "chrome/browser/chromeos/login/startup_utils.h" | 18 #include "chrome/browser/chromeos/login/startup_utils.h" |
| 20 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h" | 19 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h" |
| 21 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 20 #include "chrome/browser/chromeos/profiles/profile_helper.h" |
| 22 #include "chrome/browser/ui/browser.h" | 21 #include "chrome/browser/ui/browser.h" |
| 23 #include "chrome/browser/ui/chrome_pages.h" | 22 #include "chrome/browser/ui/chrome_pages.h" |
| 24 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 23 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 25 #include "chrome/common/pref_names.h" | 24 #include "chrome/common/pref_names.h" |
| 26 #include "chrome/common/url_constants.h" | 25 #include "chrome/common/url_constants.h" |
| 27 #include "chrome/test/base/in_process_browser_test.h" | 26 #include "chrome/test/base/in_process_browser_test.h" |
| 28 #include "chrome/test/base/ui_test_utils.h" | 27 #include "chrome/test/base/ui_test_utils.h" |
| 28 #include "components/prefs/pref_service.h" |
| 29 #include "components/user_manager/user_manager.h" | 29 #include "components/user_manager/user_manager.h" |
| 30 #include "content/public/test/test_utils.h" | 30 #include "content/public/test/test_utils.h" |
| 31 #include "ui/message_center/message_center.h" | 31 #include "ui/message_center/message_center.h" |
| 32 #include "ui/message_center/notification_list.h" | 32 #include "ui/message_center/notification_list.h" |
| 33 | 33 |
| 34 namespace chromeos { | 34 namespace chromeos { |
| 35 | 35 |
| 36 namespace { | 36 namespace { |
| 37 | 37 |
| 38 // Because policy is not needed this test it is better to use e-mails that | 38 // Because policy is not needed this test it is better to use e-mails that |
| (...skipping 114 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 |