| Index: chrome/browser/ui/startup/startup_browser_creator.cc
|
| diff --git a/chrome/browser/ui/startup/startup_browser_creator.cc b/chrome/browser/ui/startup/startup_browser_creator.cc
|
| index f89eae3a6af8e8666b57791f4aba4585170000ef..513d982c49fb4b5e27eddf086ab819b832f74419 100644
|
| --- a/chrome/browser/ui/startup/startup_browser_creator.cc
|
| +++ b/chrome/browser/ui/startup/startup_browser_creator.cc
|
| @@ -40,9 +40,6 @@
|
| #include "chrome/browser/notifications/desktop_notification_service.h"
|
| #include "chrome/browser/prefs/incognito_mode_prefs.h"
|
| #include "chrome/browser/prefs/session_startup_pref.h"
|
| -#include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
|
| -#include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h"
|
| -#include "chrome/browser/printing/print_dialog_cloud.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/profiles/profile_manager.h"
|
| #include "chrome/browser/search_engines/util.h"
|
| @@ -84,6 +81,12 @@
|
| #include "chrome/browser/ui/startup/startup_browser_creator_win.h"
|
| #endif
|
|
|
| +#if defined(ENABLE_FULL_PRINTING)
|
| +#include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
|
| +#include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h"
|
| +#include "chrome/browser/printing/print_dialog_cloud.h"
|
| +#endif
|
| +
|
| using content::BrowserThread;
|
| using content::ChildProcessSecurityPolicy;
|
|
|
| @@ -526,6 +529,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
|
| }
|
| #endif // defined(ENABLE_AUTOMATION)
|
|
|
| +#if defined(ENABLE_FULL_PRINTING)
|
| // If we are just displaying a print dialog we shouldn't open browser
|
| // windows.
|
| if (command_line.HasSwitch(switches::kCloudPrintFile) &&
|
| @@ -542,6 +546,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
|
| // launching and quit.
|
| return false;
|
| }
|
| +#endif // defined(ENABLE_FULL_PRINTING)
|
|
|
| if (command_line.HasSwitch(switches::kExplicitlyAllowedPorts)) {
|
| std::string allowed_ports =
|
|
|