Small fixes to SRTPRompt.

chrome/browser/component_updater/sw_reporter_installer_win.cc

 // Copyright (c) 2014 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/component_updater/sw_reporter_installer_win.h"
 
 #include <stdint.h>
 #include <string>
 #include <vector>
 
@@ skipping 116 matching lines @@
 
   if (exit_code == kPostRebootCleanupNeeded || exit_code == kCleanupNeeded) {
     // Find the last active browser, which may be NULL, in which case we won't
     // show the prompt this time and will wait until the next run of the
     // reporter. We can't use other ways of finding a browser because we don't
     // have a profile.
     chrome::HostDesktopType desktop_type = chrome::GetActiveDesktop();
     Browser* browser = chrome::FindLastActiveWithHostDesktopType(desktop_type);
     if (browser) {
       Profile* profile = browser->profile();
+      // Don't show the prompt again if it's been shown before for this profile.
       DCHECK(profile);
-      // Now that we have a profile, make sure we have a tabbed browser since we
-      // need to anchor the bubble to the toolbar's wrench menu. Create one if
-      // none exist already.
-      if (browser->type() != Browser::TYPE_TABBED) {
-        browser = chrome::FindTabbedBrowser(profile, false, desktop_type);
-        if (!browser)
-          browser = new Browser(Browser::CreateParams(profile, desktop_type));
-      }
       const std::string prompt_version =
           profile->GetPrefs()->GetString(prefs::kSwReporterPromptVersion);
-      // Don't show the prompt again if it's been shown before.
       if (prompt_version.empty()) {
         profile->GetPrefs()->SetString(prefs::kSwReporterPromptVersion,
                                        version);
         profile->GetPrefs()->SetInteger(prefs::kSwReporterPromptReason,
                                         exit_code);
+        // Now that we have a profile, make sure we have a tabbed browser since
+        // we need to anchor the bubble to the toolbar's wrench menu. Create one
+        // if none exist already.
+        if (browser->type() != Browser::TYPE_TABBED) {
+          browser = chrome::FindTabbedBrowser(profile, false, desktop_type);
+          if (!browser)
+            browser = new Browser(Browser::CreateParams(profile, desktop_type));
+        }
         GlobalErrorService* global_error_service =
             GlobalErrorServiceFactory::GetForProfile(profile);
         SRTGlobalError* global_error = new SRTGlobalError(global_error_service);
         // |global_error_service| takes ownership of |global_error| and keeps it
         // alive until RemoveGlobalError() is called, and even then, the object
         // is not destroyed, the caller of RemoveGlobalError is responsible to
         // destroy it, and in the case of the SRTGlobalError, it deletes itself
         // but only after the bubble has been interacted with.
         global_error_service->AddGlobalError(global_error);
 
@@ skipping 171 matching lines @@
       -1,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 
   registry->RegisterStringPref(
       prefs::kSwReporterPromptVersion,
       "",
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 }
 
 }  // namespace component_updater