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 95dd3d5d4b964d8cc08670db4288394e0443a4b4..56e442985d1fb74da5e2661e04a9980fb441a3f9 100644 |
--- a/chrome/browser/ui/startup/startup_browser_creator.cc |
+++ b/chrome/browser/ui/startup/startup_browser_creator.cc |
@@ -533,6 +533,12 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( |
} |
#if defined(OS_CHROMEOS) |
+ |
+#if defined(USE_ATHENA) |
+ // Athena will never launch browser. |
+ silent_launch = true; |
+#endif |
+ |
// The browser will be launched after the user logs in. |
if (command_line.HasSwitch(chromeos::switches::kLoginManager)) |
silent_launch = true; |
@@ -555,7 +561,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( |
chrome::AttemptUserExit(); |
return false; |
} |
-#endif |
+#endif // OS_CHROMEOS |
#if defined(TOOLKIT_VIEWS) && defined(USE_X11) |
ui::TouchFactory::SetTouchDeviceListFromCommandLine(); |