[Mac] Use the ExtensionToolbarModel for ordering of the Browser Actions. Prep...

chrome/browser/cocoa/extensions/extension_action_context_menu.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/extensions/extension_action_context_menu.h"
 
 #include "app/l10n_util_mac.h"
 #include "base/sys_string_conversions.h"
 #include "base/task.h"
 #include "chrome/browser/browser_list.h"
@@ skipping 87 matching lines @@
 // NOTE: You MUST keep this in sync with the |menuItems| NSArray below.
 enum {
   kExtensionContextName = 0,
   kExtensionContextOptions = 2,
   kExtensionContextDisable = 3,
   kExtensionContextUninstall = 4,
   kExtensionContextManage = 6
 };
 }  // namespace
 
-- (id)initWithExtension:(Extension*)extension {
+- (id)initWithExtension:(Extension*)extension profile:(Profile*)profile {
   if ((self = [super initWithTitle:@""])) {
     extension_ = extension;
+    profile_ = profile;
 
     NSArray* menuItems = [NSArray arrayWithObjects:
         base::SysUTF8ToNSString(extension->name()),
         [NSMenuItem separatorItem],
         l10n_util::GetNSStringWithFixup(IDS_EXTENSIONS_OPTIONS),
         l10n_util::GetNSStringWithFixup(IDS_EXTENSIONS_DISABLE),
         l10n_util::GetNSStringWithFixup(IDS_EXTENSIONS_UNINSTALL),
         [NSMenuItem separatorItem],
         l10n_util::GetNSStringWithFixup(IDS_MANAGE_EXTENSIONS),
         nil];
@@ skipping 20 matching lines @@
         }
       }
     }
 
     return self;
   }
   return nil;
 }
 
 - (void)dispatch:(id)menuItem {
-  Browser* browser = BrowserList::GetLastActive();
-  // GetLastActive() returns NULL during testing.
+  Browser* browser = BrowserList::FindBrowserWithProfile(profile_);
   if (!browser)
     return;
 
-  Profile* profile = browser->profile();
-
   NSMenuItem* item = (NSMenuItem*)menuItem;
   switch ([item tag]) {
     case kExtensionContextName: {
       GURL url(std::string(extension_urls::kGalleryBrowsePrefix) +
                std::string("/detail/") + extension_->id());
       browser->OpenURL(url, GURL(), NEW_FOREGROUND_TAB, PageTransition::LINK);
       break;
     }
     case kExtensionContextOptions: {
       DCHECK(!extension_->options_url().is_empty());
       browser->OpenURL(extension_->options_url(), GURL(),
                        NEW_FOREGROUND_TAB, PageTransition::LINK);
       break;
     }
     case kExtensionContextDisable: {
-      ExtensionsService* extension_service = profile->GetExtensionsService();
-      extension_service->DisableExtension(extension_->id());
+      ExtensionsService* extensionService = profile_->GetExtensionsService();
+      if (!extensionService)
+        return; // Incognito mode.
+      extensionService->DisableExtension(extension_->id());
       break;
     }
     case kExtensionContextUninstall: {
       if (uninstaller_.get())
         uninstaller_->Cancel();
 
       uninstaller_ = new AsyncUninstaller(extension_);
       uninstaller_->LoadExtensionIconThenConfirmUninstall();
       break;
     }
     case kExtensionContextManage: {
       browser->OpenURL(GURL(chrome::kChromeUIExtensionsURL), GURL(),
                        NEW_FOREGROUND_TAB, PageTransition::LINK);
       break;
     }
     default:
       NOTREACHED();
       break;
   }
 }
 
 @end