Make DownloadProtectionService not use BrowserList::GetLastActive() to load a link. Instead pass th…

chrome/browser/ui/cocoa/download/download_item_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/download/download_item_controller.h"
 
 #include "base/mac/bundle_locations.h"
 #include "base/mac/mac_util.h"
 #include "base/metrics/histogram.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/download/chrome_download_manager_delegate.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_shelf_context_menu.h"
 #include "chrome/browser/download/download_util.h"
 #import "chrome/browser/themes/theme_service.h"
 #import "chrome/browser/ui/cocoa/download/download_item_button.h"
 #import "chrome/browser/ui/cocoa/download/download_item_cell.h"
 #include "chrome/browser/ui/cocoa/download/download_item_mac.h"
 #import "chrome/browser/ui/cocoa/download/download_shelf_controller.h"
 #import "chrome/browser/ui/cocoa/themed_window.h"
 #import "chrome/browser/ui/cocoa/ui_localizer.h"
 #include "content/public/browser/download_item.h"
+#include "content/public/browser/page_navigator.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/text/text_elider.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/image/image.h"
 
 using content::DownloadItem;
@@ skipping 30 matching lines @@
     [contentView setAutoresizesSubviews:YES];
   }
 }
 
 }  // namespace
 
 // A class for the chromium-side part of the download shelf context menu.
 
 class DownloadShelfContextMenuMac : public DownloadShelfContextMenu {
  public:
-  DownloadShelfContextMenuMac(BaseDownloadItemModel* model)
-      : DownloadShelfContextMenu(model) { }
+  DownloadShelfContextMenuMac(BaseDownloadItemModel* model,
+                              content::PageNavigator* navigator)
+      : DownloadShelfContextMenu(model, navigator) { }
 
   using DownloadShelfContextMenu::ExecuteCommand;
   using DownloadShelfContextMenu::IsCommandIdChecked;
   using DownloadShelfContextMenu::IsCommandIdEnabled;
 
   using DownloadShelfContextMenu::SHOW_IN_FOLDER;
   using DownloadShelfContextMenu::OPEN_WHEN_COMPLETE;
   using DownloadShelfContextMenu::ALWAYS_OPEN_TYPE;
   using DownloadShelfContextMenu::CANCEL;
   using DownloadShelfContextMenu::TOGGLE_PAUSE;
 };
 
 @interface DownloadItemController (Private)
 - (void)themeDidChangeNotification:(NSNotification*)aNotification;
 - (void)updateTheme:(ui::ThemeProvider*)themeProvider;
 - (void)setState:(DownoadItemState)state;
 @end
 
 // Implementation of DownloadItemController
 
 @implementation DownloadItemController
 
 - (id)initWithModel:(BaseDownloadItemModel*)downloadModel
-              shelf:(DownloadShelfController*)shelf {
+              shelf:(DownloadShelfController*)shelf
+          navigator:(content::PageNavigator*)navigator {
   if ((self = [super initWithNibName:@"DownloadItem"
                               bundle:base::mac::FrameworkBundle()])) {
     // Must be called before [self view], so that bridge_ is set in awakeFromNib
     bridge_.reset(new DownloadItemMac(downloadModel, self));
-    menuBridge_.reset(new DownloadShelfContextMenuMac(downloadModel));
+    menuBridge_.reset(new DownloadShelfContextMenuMac(downloadModel,
+                                                      navigator));
 
     NSNotificationCenter* defaultCenter = [NSNotificationCenter defaultCenter];
     [defaultCenter addObserver:self
                       selector:@selector(themeDidChangeNotification:)
                           name:kBrowserThemeDidChangeNotification
                         object:nil];
 
     shelf_ = shelf;
     state_ = kNormal;
     creationTime_ = base::Time::Now();
@@ skipping 250 matching lines @@
     [sender setTitle:l10n_util::GetNSStringWithFixup(
         IDS_DOWNLOAD_MENU_PAUSE_ITEM)];
   } else {
     [sender setTitle:l10n_util::GetNSStringWithFixup(
         IDS_DOWNLOAD_MENU_RESUME_ITEM)];
   }
   menuBridge_->ExecuteCommand(DownloadShelfContextMenuMac::TOGGLE_PAUSE);
 }
 
 @end