MacViews: Fix duplicate ShowSessionCrashBubble and ShowProfileResetBubble

chrome/browser/profile_resetter/automatic_profile_resetter_delegate.cc

 // Copyright 2013 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/profile_resetter/automatic_profile_resetter_delegate.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 250 matching lines @@
     TemplateURL template_url(**it);
     engines_details_list->Append(
         BuildSubTreeFromTemplateURL(&template_url).release());
   }
   return engines_details_list.Pass();
 }
 
 bool AutomaticProfileResetterDelegateImpl::TriggerPrompt() {
   DCHECK(global_error_service_);
 
-  if (!ProfileResetGlobalError::IsSupportedOnPlatform())
+  Browser* browser = chrome::FindTabbedBrowser(
+      profile_, false /*match_original_profiles*/, chrome::GetActiveDesktop());
+  if (!browser || !ProfileResetGlobalError::IsSupportedOnPlatform(browser))
     return false;
 
   ProfileResetGlobalError* global_error = new ProfileResetGlobalError(profile_);
   global_error_service_->AddGlobalError(global_error);
 
   // Do not try to show bubble if another GlobalError is already showing one.
   const GlobalErrorService::GlobalErrorList& global_errors(
       global_error_service_->errors());
   GlobalErrorService::GlobalErrorList::const_iterator it;
   for (it = global_errors.begin(); it != global_errors.end(); ++it) {
     if ((*it)->GetBubbleView())
       break;
   }
-  if (it == global_errors.end()) {
-    Browser* browser = chrome::FindTabbedBrowser(
-        profile_,
-        false /*match_original_profiles*/,
-        chrome::GetActiveDesktop());
-    if (browser)
-      global_error->ShowBubbleView(browser);
-  }
+  if (it == global_errors.end())
+    global_error->ShowBubbleView(browser);
   return true;
 }
 
 void AutomaticProfileResetterDelegateImpl::TriggerProfileSettingsReset(
     bool send_feedback,
     const base::Closure& completion) {
   DCHECK(!profile_resetter_);
   DCHECK(!completion.is_null());
 
   profile_resetter_.reset(new ProfileResetter(profile_));
@@ skipping 85 matching lines @@
     if (difference) {
       old_settings_snapshot->Subtract(new_settings_snapshot);
       std::string report =
           SerializeSettingsReport(*old_settings_snapshot, difference);
       SendFeedback(report);
     }
   }
   content::BrowserThread::PostTask(
       content::BrowserThread::UI, FROM_HERE, user_callback);
 }