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

Unified Diff: chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc

Issue 522493002: Removed Ctrl+Shift+P shortcut for system dialog printing on Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fri Aug 29 11:27:33 PDT 2014 Created 6 years, 4 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/accelerator_table.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc b/chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc
index 02e76944431740f3d937c0fa38efad9049dbc1da..81ef698e79d6a45570d92eee01ad2d21ce51c3fe 100644
--- a/chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc
@@ -56,17 +56,22 @@ IN_PROC_BROWSER_TEST_F(PrintPreviewTest, PrintCommands) {
ASSERT_TRUE(chrome::IsCommandEnabled(browser(), IDC_PRINT));
- // Make sure advanced print command (Ctrl+Shift+p) is enabled.
- ASSERT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ADVANCED_PRINT));
+#if defined(OS_WIN)
+ bool is_advanced_print_expected = false;
+#else
+ bool is_advanced_print_expected = true;
+#endif // OS_WIN
+
+ ASSERT_EQ(is_advanced_print_expected,
+ chrome::IsCommandEnabled(browser(), IDC_ADVANCED_PRINT));
// Create the print preview dialog.
Print();
- // Make sure print is disabled.
ASSERT_FALSE(chrome::IsCommandEnabled(browser(), IDC_PRINT));
- // Make sure advanced print command (Ctrl+Shift+p) is enabled.
- ASSERT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ADVANCED_PRINT));
+ ASSERT_EQ(is_advanced_print_expected,
+ chrome::IsCommandEnabled(browser(), IDC_ADVANCED_PRINT));
content::TestNavigationObserver reload_observer(
browser()->tab_strip_model()->GetActiveWebContents());
@@ -75,8 +80,8 @@ IN_PROC_BROWSER_TEST_F(PrintPreviewTest, PrintCommands) {
ASSERT_TRUE(chrome::IsCommandEnabled(browser(), IDC_PRINT));
- // Make sure advanced print command (Ctrl+Shift+p) is enabled.
- ASSERT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ADVANCED_PRINT));
+ ASSERT_EQ(is_advanced_print_expected,
+ chrome::IsCommandEnabled(browser(), IDC_ADVANCED_PRINT));
}
// Disable the test for mac, see http://crbug/367665.
« no previous file with comments | « chrome/browser/ui/views/accelerator_table.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698