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 e962922213fee663670f06fe6d8399768792b66c..ff67076562b306573a41215b8ed50ecae2db7b41 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -1997,15 +1997,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() {