Don't show first run bubble for non-tabbed windows

chrome/browser/ui/browser.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/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // OS_WIN
@@ skipping 5449 matching lines @@
 
 void Browser::ToggleSpeechInput() {
   GetSelectedTabContentsWrapper()->render_view_host()->ToggleSpeechInput();
 }
 
 void Browser::OnWindowDidShow() {
   if (window_has_shown_)
     return;
   window_has_shown_ = true;
 
+  // Nothing to do for non-tabbed windows.
+  if (!is_type_tabbed())
+    return;
+
   // Suppress the first run bubble if we're showing the sync promo.
   TabContents* contents = GetSelectedTabContents();
   bool is_showing_promo = contents &&
       contents->GetURL().SchemeIs(chrome::kChromeUIScheme) &&
       contents->GetURL().host() == chrome::kChromeUISyncPromoHost;
 
   // Show the First Run information bubble if we've been told to.
   PrefService* local_state = g_browser_process->local_state();
   if (!is_showing_promo && local_state &&
       local_state->GetBoolean(prefs::kShouldShowFirstRunBubble)) {
     FirstRun::BubbleType bubble_type = FirstRun::MINIMAL_BUBBLE;
     if (local_state->
         FindPreference(prefs::kShouldUseOEMFirstRunBubble) &&
         local_state->GetBoolean(prefs::kShouldUseOEMFirstRunBubble)) {
       bubble_type = FirstRun::OEM_BUBBLE;
     } else if (local_state->
         FindPreference(prefs::kShouldUseMinimalFirstRunBubble) &&
         local_state->GetBoolean(prefs::kShouldUseMinimalFirstRunBubble)) {
       bubble_type = FirstRun::MINIMAL_BUBBLE;
     }
     // Reset the preference so we don't show the bubble for subsequent
     // windows.
     local_state->SetBoolean(prefs::kShouldShowFirstRunBubble, false);
     window_->GetLocationBar()->ShowFirstRunBubble(bubble_type);
-  } else if (is_type_tabbed()) {
+  } else {
     GlobalErrorService* service =
         GlobalErrorServiceFactory::GetForProfile(profile());
     GlobalError* error = service->GetFirstGlobalErrorWithBubbleView();
     if (error) {
       error->ShowBubbleView(this);
     }
   }
 }
 
 FullscreenExitBubbleType Browser::GetFullscreenExitBubbleType() const {
@@ skipping 16 matching lines @@
 }
 
 void Browser::UpdateFullscreenExitBubbleContent() {
   GURL url;
   if (fullscreened_tab_)
     url = fullscreened_tab_->tab_contents()->GetURL();
 
   window_->UpdateFullscreenExitBubbleContent(
       url, GetFullscreenExitBubbleType());
 }