Aura: Add --aura-laptop-mode to fill the workspace with a single window.

chrome/browser/ui/views/frame/browser_view.cc

Index: chrome/browser/ui/views/frame/browser_view.cc
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index 9224b144964cd29819a611289ffc5772aad4cb0f..f5e15b6f72025d4addded62bea0d42484d0f4e9e 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -1998,15 +1998,18 @@ void BrowserView::Init() {
   ignore_layout_ = false;
 
 #if defined(USE_AURA)
+  // Add launcher item if we're using the launcher and this type of browser
+  // needs an item.
   aura_shell::LauncherItemType type;
-  if (ChromeShellDelegate::ShouldCreateLauncherItemForBrowser(browser_.get(),
+  if (aura_shell::Shell::GetInstance()->launcher() &&
+      ChromeShellDelegate::ShouldCreateLauncherItemForBrowser(browser_.get(),
                                                               &type)) {
     icon_updater_.reset(new LauncherIconUpdater(
         browser_->tabstrip_model(),
         aura_shell::Shell::GetInstance()->launcher()->model(),
         frame_->GetNativeWindow()));
   }
-#endif
+#endif  // defined(USE_AURA)
 }
 
 void BrowserView::LoadingAnimationCallback() {