Merge 64298 - If default browser is set to FF, and Chrome is run as first-run...

chrome/browser/cocoa/search_engine_dialog_controller.mm

 // Copyright (c) 2010 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.
 
 #import "chrome/browser/cocoa/search_engine_dialog_controller.h"
 
 #include <algorithm>
 
 #include "app/l10n_util_mac.h"
 #include "app/resource_bundle.h"
@@ skipping 22 matching lines @@
 const int kLogoLabelHeight = 25;
 
 @interface SearchEngineDialogController (Private)
 - (void)onTemplateURLModelChanged;
 - (void)buildSearchEngineView;
 - (NSView*)viewForSearchEngine:(const TemplateURL*)engine
                        atIndex:(size_t)index;
 - (IBAction)searchEngineSelected:(id)sender;
 @end
 
-class SearchEngineDialogControllerBridge : public TemplateURLModelObserver {
+class SearchEngineDialogControllerBridge :
+    public base::RefCounted<SearchEngineDialogControllerBridge>,
+    public TemplateURLModelObserver {
  public:
   SearchEngineDialogControllerBridge(SearchEngineDialogController* controller);
 
   // TemplateURLModelObserver
   virtual void OnTemplateURLModelChanged();
 
  private:
   SearchEngineDialogController* controller_;
 };
 
@@ skipping 10 matching lines @@
 
 @synthesize profile = profile_;
 @synthesize randomize = randomize_;
 
 - (id)init {
   NSString* nibpath =
       [mac_util::MainAppBundle() pathForResource:@"SearchEngineDialog"
                                           ofType:@"nib"];
   self = [super initWithWindowNibPath:nibpath owner:self];
   if (self != nil) {
-    bridge_.reset(new SearchEngineDialogControllerBridge(self));
+    bridge_ = new SearchEngineDialogControllerBridge(self);
   }
   return self;
 }
 
 - (void)dealloc {
   [super dealloc];
 }
 
 - (IBAction)showWindow:(id)sender {
   searchEnginesModel_ = profile_->GetTemplateURLModel();
   searchEnginesModel_->AddObserver(bridge_.get());
 
   if (searchEnginesModel_->loaded()) {
-    [self onTemplateURLModelChanged];
+    MessageLoop::current()->PostTask(
+        FROM_HERE,
+        NewRunnableMethod(
+            bridge_.get(),
+            &SearchEngineDialogControllerBridge::OnTemplateURLModelChanged));
   } else {
     searchEnginesModel_->Load();
-    MessageLoop::current()->Run();
   }
+  MessageLoop::current()->Run();
 }
 
 - (void)onTemplateURLModelChanged {
   searchEnginesModel_->RemoveObserver(bridge_.get());
 
   // Add the search engines in the search_engines_model_ to the buttons list.
   // The first three will always be from prepopulated data.
   std::vector<const TemplateURL*> templateUrls =
       searchEnginesModel_->GetTemplateURLs();
 
@@ skipping 167 matching lines @@
 - (NSFont*)mainLabelFont {
   return [NSFont boldSystemFontOfSize:13];
 }
 
 - (IBAction)searchEngineSelected:(id)sender {
   [[self window] close];
   [NSApp stopModalWithCode:[sender tag]];
 }
 
 @end