Merge 34812 - Add the rightclick context menu for Browser actions and Page...

chrome/browser/extensions/extension_disabled_infobar_delegate.cc

 // Copyright (c) 2009 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/extensions/extension_disabled_infobar_delegate.h"
 
 #include "app/l10n_util.h"
 #include "chrome/browser/chrome_thread.h"
-#include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/extension_file_util.h"
 #include "chrome/browser/extensions/extension_install_ui.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_service.h"
 #include "grit/generated_resources.h"
@@ skipping 28 matching lines @@
   }
 
  private:
   friend class base::RefCountedThreadSafe<ExtensionDisabledDialogDelegate>;
 
   virtual ~ExtensionDisabledDialogDelegate() {}
 
   void Start() {
     // We start on the file thread so we can decode the install icon.
     FilePath install_icon_path = install_icon_resource_.GetFilePath();
-    CrxInstaller::DecodeInstallIcon(install_icon_path, &install_icon_);
+    Extension::DecodeIconFromPath(
+        install_icon_path, Extension::EXTENSION_ICON_LARGE, &install_icon_);
     // Then we display the UI on the UI thread.
     ChromeThread::PostTask(
         ChromeThread::UI, FROM_HERE,
         NewRunnableMethod(
             this, &ExtensionDisabledDialogDelegate::ConfirmInstall));
   }
 
   void ConfirmInstall() {
     DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
     ExtensionInstallUI ui(profile_);
@@ skipping 78 matching lines @@
   if (!browser)
     return;
 
   TabContents* tab_contents = browser->GetSelectedTabContents();
   if (!tab_contents)
     return;
 
   tab_contents->AddInfoBar(new ExtensionDisabledInfobarDelegate(
       tab_contents, service, extension));
 }