| OLD | NEW |
| 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 "base/prefs/pref_service.h" |
| 5 #include "base/utf_string_conversions.h" | 6 #include "base/utf_string_conversions.h" |
| 6 #include "chrome/browser/browser_process.h" | 7 #include "chrome/browser/browser_process.h" |
| 7 #include "chrome/browser/notifications/balloon.h" | 8 #include "chrome/browser/notifications/balloon.h" |
| 8 #include "chrome/browser/notifications/balloon_collection_impl.h" | 9 #include "chrome/browser/notifications/balloon_collection_impl.h" |
| 9 #include "chrome/browser/notifications/balloon_notification_ui_manager.h" | 10 #include "chrome/browser/notifications/balloon_notification_ui_manager.h" |
| 10 #include "chrome/browser/notifications/desktop_notification_service.h" | 11 #include "chrome/browser/notifications/desktop_notification_service.h" |
| 11 #include "chrome/browser/notifications/notification.h" | 12 #include "chrome/browser/notifications/notification.h" |
| 12 #include "chrome/browser/prefs/pref_service.h" | |
| 13 #include "chrome/browser/ui/browser.h" | 13 #include "chrome/browser/ui/browser.h" |
| 14 #include "chrome/browser/ui/panels/base_panel_browser_test.h" | 14 #include "chrome/browser/ui/panels/base_panel_browser_test.h" |
| 15 #include "chrome/browser/ui/panels/detached_panel_collection.h" | 15 #include "chrome/browser/ui/panels/detached_panel_collection.h" |
| 16 #include "chrome/browser/ui/panels/docked_panel_collection.h" | 16 #include "chrome/browser/ui/panels/docked_panel_collection.h" |
| 17 #include "chrome/browser/ui/panels/panel.h" | 17 #include "chrome/browser/ui/panels/panel.h" |
| 18 #include "chrome/browser/ui/panels/panel_manager.h" | 18 #include "chrome/browser/ui/panels/panel_manager.h" |
| 19 #include "chrome/common/pref_names.h" | 19 #include "chrome/common/pref_names.h" |
| 20 #include "content/public/common/show_desktop_notification_params.h" | 20 #include "content/public/common/show_desktop_notification_params.h" |
| 21 #include "ui/gfx/screen.h" | 21 #include "ui/gfx/screen.h" |
| 22 | 22 |
| (...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 402 MessageLoopForUI::current()->RunUntilIdle(); | 402 MessageLoopForUI::current()->RunUntilIdle(); |
| 403 EXPECT_EQ(balloon_bottom_after_short_panel_created, | 403 EXPECT_EQ(balloon_bottom_after_short_panel_created, |
| 404 GetBalloonBottomPosition(balloon)); | 404 GetBalloonBottomPosition(balloon)); |
| 405 | 405 |
| 406 // Close short panel. Expect that the notification balloo moves back to its | 406 // Close short panel. Expect that the notification balloo moves back to its |
| 407 // original position. | 407 // original position. |
| 408 short_panel->Close(); | 408 short_panel->Close(); |
| 409 MessageLoopForUI::current()->RunUntilIdle(); | 409 MessageLoopForUI::current()->RunUntilIdle(); |
| 410 EXPECT_EQ(original_balloon_bottom, GetBalloonBottomPosition(balloon)); | 410 EXPECT_EQ(original_balloon_bottom, GetBalloonBottomPosition(balloon)); |
| 411 } | 411 } |
| OLD | NEW |