Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(151)

Side by Side Diff: chrome/browser/extensions/crx_installer.cc

Issue 10843014: Generalize ExtensionIconSet to store icon paths for custom size sets (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/extensions/crx_installer.h" 5 #include "chrome/browser/extensions/crx_installer.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 361 matching lines...) Expand 10 before | Expand all | Expand 10 after
372 unpacked_extension_root_ = extension_dir; 372 unpacked_extension_root_ = extension_dir;
373 373
374 CrxInstallerError error = AllowInstall(extension); 374 CrxInstallerError error = AllowInstall(extension);
375 if (error.type() != CrxInstallerError::ERROR_NONE) { 375 if (error.type() != CrxInstallerError::ERROR_NONE) {
376 ReportFailureFromFileThread(error); 376 ReportFailureFromFileThread(error);
377 return; 377 return;
378 } 378 }
379 379
380 if (client_) { 380 if (client_) {
381 Extension::DecodeIcon(extension_.get(), 381 Extension::DecodeIcon(extension_.get(),
382 ExtensionIconSet::EXTENSION_ICON_LARGE, 382 extension_misc::EXTENSION_ICON_LARGE,
383 ExtensionIconSet::MATCH_BIGGER, 383 ExtensionIconSet::MATCH_BIGGER,
384 &install_icon_); 384 &install_icon_);
385 } 385 }
386 386
387 if (!BrowserThread::PostTask( 387 if (!BrowserThread::PostTask(
388 BrowserThread::UI, FROM_HERE, 388 BrowserThread::UI, FROM_HERE,
389 base::Bind(&CrxInstaller::ConfirmInstall, this))) 389 base::Bind(&CrxInstaller::ConfirmInstall, this)))
390 NOTREACHED(); 390 NOTREACHED();
391 } 391 }
392 392
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
619 // is problematic because they don't know anything about the 619 // is problematic because they don't know anything about the
620 // extension before it is unpacked, so they cannot filter based 620 // extension before it is unpacked, so they cannot filter based
621 // on the extension. 621 // on the extension.
622 content::NotificationService::current()->Notify( 622 content::NotificationService::current()->Notify(
623 chrome::NOTIFICATION_CRX_INSTALLER_DONE, 623 chrome::NOTIFICATION_CRX_INSTALLER_DONE,
624 content::Source<CrxInstaller>(this), 624 content::Source<CrxInstaller>(this),
625 content::Details<const Extension>(extension)); 625 content::Details<const Extension>(extension));
626 } 626 }
627 627
628 } // namespace extensions 628 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/api/management/management_api.cc ('k') | chrome/browser/extensions/extension_icon_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698