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

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

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/frame/browser_view.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 1979 matching lines @@
     aeropeek_manager_.reset(new AeroPeekManager(
         frame_->GetNativeWindow()));
     browser_->tabstrip_model()->AddObserver(aeropeek_manager_.get());
   }
 #endif
 
   // We're now initialized and ready to process Layout requests.
   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() {
   base::TimeTicks now = base::TimeTicks::Now();
   if (!last_animation_time_.is_null()) {
     UMA_HISTOGRAM_TIMES(
         "Tabs.LoadingAnimationTime",
         now - last_animation_time_);
   }
   last_animation_time_ = now;
@@ skipping 638 matching lines @@
   browser::CreateViewsBubble(bubble);
   bubble->SetAlignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE);
   bubble->Show();
 }
 
 void BrowserView::ShowAvatarBubbleFromAvatarButton() {
   AvatarMenuButton* button = frame_->GetAvatarMenuButton();
   if (button)
     button->ShowAvatarBubble();
 }