Refactoring ExtenionInstallUI to abstract the Browser references.

chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.mm

 // Copyright (c) 2012 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/ui/cocoa/extensions/extension_install_dialog_controller.h"
 
 #include "base/i18n/rtl.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/mac_util.h"
 #include "base/memory/scoped_nsobject.h"
@@ skipping 72 matching lines @@
 @synthesize warningsField = warningsField_;
 @synthesize cancelButton = cancelButton_;
 @synthesize okButton = okButton_;
 @synthesize warningsSeparator = warningsSeparator_;
 @synthesize ratingStars = ratingStars_;
 @synthesize ratingCountField = ratingCountField_;
 @synthesize userCountField = userCountField_;
 
 - (id)initWithParentWindow:(NSWindow*)window
                    profile:(Profile*)profile
-                  delegate:(ExtensionInstallUI::Delegate*)delegate
-                    prompt:(const ExtensionInstallUI::Prompt&)prompt {
+                  delegate:(ExtensionInstallPrompt::Delegate*)delegate
+                    prompt:(const ExtensionInstallPrompt::Prompt&)prompt {
   NSString* nibpath = nil;
 
   // We use a different XIB in the case of bundle installs, inline installs or
   // no permission warnings. These are laid out nicely for the data they
   // display.
-  if (prompt.type() == ExtensionInstallUI::BUNDLE_INSTALL_PROMPT) {
+  if (prompt.type() == ExtensionInstallPrompt::BUNDLE_INSTALL_PROMPT) {
     nibpath = [base::mac::FrameworkBundle()
                pathForResource:@"ExtensionInstallPromptBundle"
                         ofType:@"nib"];
-  } else if (prompt.type() == ExtensionInstallUI::INLINE_INSTALL_PROMPT) {
+  } else if (prompt.type() == ExtensionInstallPrompt::INLINE_INSTALL_PROMPT) {
     nibpath = [base::mac::FrameworkBundle()
                pathForResource:@"ExtensionInstallPromptInline"
                         ofType:@"nib"];
   } else if (prompt.GetPermissionCount() == 0) {
     nibpath = [base::mac::FrameworkBundle()
                pathForResource:@"ExtensionInstallPromptNoWarnings"
                         ofType:@"nib"];
   } else {
    nibpath = [base::mac::FrameworkBundle()
               pathForResource:@"ExtensionInstallPrompt"
                        ofType:@"nib"];
   }
 
   if ((self = [super initWithWindowNibPath:nibpath owner:self])) {
     parentWindow_ = window;
     profile_ = profile;
     delegate_ = delegate;
-    prompt_.reset(new ExtensionInstallUI::Prompt(prompt));
+    prompt_.reset(new ExtensionInstallPrompt::Prompt(prompt));
   }
   return self;
 }
 
 - (void)runAsModalSheet {
   [NSApp beginSheet:[self window]
      modalForWindow:parentWindow_
       modalDelegate:self
      didEndSelector:@selector(didEndSheet:returnCode:contextInfo:)
         contextInfo:nil];
@@ skipping 150 matching lines @@
          returnCode:(int)returnCode
         contextInfo:(void*)contextInfo {
   [sheet close];
 }
 
 - (void)windowWillClose:(NSNotification*)notification {
   [self autorelease];
 }
 
 - (BOOL)isBundleInstall {
-  return prompt_->type() == ExtensionInstallUI::BUNDLE_INSTALL_PROMPT;
+  return prompt_->type() == ExtensionInstallPrompt::BUNDLE_INSTALL_PROMPT;
 }
 
 - (BOOL)isInlineInstall {
-  return prompt_->type() == ExtensionInstallUI::INLINE_INSTALL_PROMPT;
+  return prompt_->type() == ExtensionInstallPrompt::INLINE_INSTALL_PROMPT;
 }
 
 - (void)appendRatingStar:(const gfx::ImageSkia*)skiaImage {
   NSImage* image = gfx::SkBitmapToNSImageWithColorSpace(
       *skiaImage, base::mac::GetSystemColorSpace());
   NSRect frame = NSMakeRect(0, 0, skiaImage->width(), skiaImage->height());
   scoped_nsobject<NSImageView> view([[NSImageView alloc] initWithFrame:frame]);
   [view setImage:image];
 
   // Add this star after all the other ones
   CGFloat maxStarRight = 0;
   if ([[ratingStars_ subviews] count]) {
     maxStarRight = NSMaxX([[[ratingStars_ subviews] lastObject] frame]);
   }
   NSRect starBounds = NSMakeRect(maxStarRight, 0,
                                  skiaImage->width(), skiaImage->height());
   [view setFrame:starBounds];
   [ratingStars_ addSubview:view];
 }
 
 @end  // ExtensionInstallDialogController
 
 void ShowExtensionInstallDialogImpl(
     Profile* profile,
-    ExtensionInstallUI::Delegate* delegate,
-    const ExtensionInstallUI::Prompt& prompt) {
-  Browser* browser = browser::FindLastActiveWithProfile(profile);
+    ExtensionInstallPrompt::Delegate* delegate,
+    const ExtensionInstallPrompt::Prompt& prompt) {
+  Browser* browser = BrowserList::FindLastActiveWithProfile(profile);

[sky, 2012/06/08 02:52:02]

The old code (browser::Find...) is right. FindLast... was moved to
browser_finder, which is a collection of functions in the browser namespace.

   if (!browser) {
     delegate->InstallUIAbort(false);
     return;
   }
 
   BrowserWindow* window = browser->window();
   if (!window) {
     delegate->InstallUIAbort(false);
     return;
   }
 
   gfx::NativeWindow native_window = window->GetNativeWindow();
 
   ExtensionInstallDialogController* controller =
       [[ExtensionInstallDialogController alloc]
         initWithParentWindow:native_window
                      profile:profile
                     delegate:delegate
                       prompt:prompt];
 
   // TODO(mihaip): Switch this to be tab-modal (http://crbug.com/95455)
   [controller runAsModalSheet];
 }