| 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 "chrome/browser/printing/print_preview_dialog_controller.h" | 5 #include "chrome/browser/printing/print_preview_dialog_controller.h" |
| 6 #include "chrome/browser/printing/print_preview_test.h" | 6 #include "chrome/browser/printing/print_preview_test.h" |
| 7 #include "chrome/browser/printing/print_view_manager.h" | 7 #include "chrome/browser/printing/print_view_manager.h" |
| 8 #include "chrome/browser/ui/browser_commands.h" | 8 #include "chrome/browser/ui/browser_commands.h" |
| 9 #include "chrome/browser/ui/browser_finder.h" | 9 #include "chrome/browser/ui/browser_finder.h" |
| 10 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 10 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 11 #include "chrome/browser/ui/webui/print_preview/print_preview_ui.h" | 11 #include "chrome/browser/ui/webui/print_preview/print_preview_ui.h" |
| 12 #include "content/public/browser/navigation_details.h" | 12 #include "content/public/browser/navigation_details.h" |
| 13 #include "content/public/browser/notification_service.h" | |
| 14 #include "content/public/browser/notification_types.h" | |
| 15 #include "content/public/common/url_constants.h" | 13 #include "content/public/common/url_constants.h" |
| 16 | 14 |
| 17 using content::WebContents; | 15 using content::WebContents; |
| 18 | 16 |
| 19 // Test crashes on Aura due to initiator's native view having no parent. | 17 // Test crashes on Aura due to initiator's native view having no parent. |
| 20 // http://crbug.com/104284 | 18 // http://crbug.com/104284 |
| 21 #if defined(USE_AURA) | 19 #if defined(USE_AURA) |
| 22 #define MAYBE_GetOrCreatePreviewDialog DISABLED_GetOrCreatePreviewDialog | 20 #define MAYBE_GetOrCreatePreviewDialog DISABLED_GetOrCreatePreviewDialog |
| 23 #define MAYBE_MultiplePreviewDialogs DISABLED_MultiplePreviewDialogs | 21 #define MAYBE_MultiplePreviewDialogs DISABLED_MultiplePreviewDialogs |
| 24 #define MAYBE_ClearInitiatorDetails DISABLED_ClearInitiatorDetails | 22 #define MAYBE_ClearInitiatorDetails DISABLED_ClearInitiatorDetails |
| (...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 167 dialog_controller->GetOrCreatePreviewDialog(initiator); | 165 dialog_controller->GetOrCreatePreviewDialog(initiator); |
| 168 | 166 |
| 169 // New print preview dialog is a constrained window, so the number of tabs is | 167 // New print preview dialog is a constrained window, so the number of tabs is |
| 170 // still 1. | 168 // still 1. |
| 171 EXPECT_EQ(1, browser()->tab_strip_model()->count()); | 169 EXPECT_EQ(1, browser()->tab_strip_model()->count()); |
| 172 // Verify a new print preview dialog has been created. | 170 // Verify a new print preview dialog has been created. |
| 173 EXPECT_NE(new_preview_dialog, preview_dialog); | 171 EXPECT_NE(new_preview_dialog, preview_dialog); |
| 174 } | 172 } |
| 175 | 173 |
| 176 } // namespace printing | 174 } // namespace printing |
| OLD | NEW |