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

Unified Diff: chrome/browser/apps/app_browsertest.cc

Issue 702603004: Renamed DISABLE_BASIC_PRINTING and ENABLE_FULL_PRINTING. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Wed Nov 5 02:31:54 PST 2014 Created 6 years, 1 month 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
Index: chrome/browser/apps/app_browsertest.cc
diff --git a/chrome/browser/apps/app_browsertest.cc b/chrome/browser/apps/app_browsertest.cc
index 653a5ab30129d52353d6d295a32d0d4677412644..9db785e809d5d34c9293311b44ce72a5e98bdf2c 100644
--- a/chrome/browser/apps/app_browsertest.cc
+++ b/chrome/browser/apps/app_browsertest.cc
@@ -115,7 +115,7 @@ class TabsAddedNotificationObserver
DISALLOW_COPY_AND_ASSIGN(TabsAddedNotificationObserver);
};
-#if defined(ENABLE_FULL_PRINTING)
+#if defined(ENABLE_PRINT_PREVIEW)
class ScopedPreviewTestingDelegate : PrintPreviewUI::TestingDelegate {
public:
explicit ScopedPreviewTestingDelegate(bool auto_cancel)
@@ -168,7 +168,7 @@ class ScopedPreviewTestingDelegate : PrintPreviewUI::TestingDelegate {
gfx::Size dialog_size_;
};
-#endif // ENABLE_FULL_PRINTING
+#endif // ENABLE_PRINT_PREVIEW
#if !defined(OS_CHROMEOS) && !defined(OS_WIN)
bool CopyTestDataAndSetCommandLineArg(
@@ -1116,8 +1116,7 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, MAYBE_WebContentsHasFocus) {
->HasFocus());
}
-
-#if defined(ENABLE_FULL_PRINTING)
+#if defined(ENABLE_PRINT_PREVIEW)
#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
#define MAYBE_WindowDotPrintShouldBringUpPrintPreview \
@@ -1168,8 +1167,7 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest,
minimum_dialog_size.height());
GetFirstAppWindow()->GetBaseWindow()->Close();
}
-#endif // ENABLE_FULL_PRINTING
-
+#endif // ENABLE_PRINT_PREVIEW
#if defined(OS_CHROMEOS)

Powered by Google App Engine
This is Rietveld 408576698