diff options
| author | koz@chromium.org <koz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-13 13:25:30 +0000 |
|---|---|---|
| committer | koz@chromium.org <koz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-13 13:25:30 +0000 |
| commit | 8f6af03725c187128d3689614ff22bb8d0477979 (patch) | |
| tree | 9461397878194c679bd747b30d12f5832fefdc16 /chrome/browser/extensions | |
| parent | e006709371f8c6c6cd93d6680fc02f9e5bcb3295 (diff) | |
| download | chromium_src-8f6af03725c187128d3689614ff22bb8d0477979.zip chromium_src-8f6af03725c187128d3689614ff22bb8d0477979.tar.gz chromium_src-8f6af03725c187128d3689614ff22bb8d0477979.tar.bz2 | |
Put a tab overlay over installing v1 apps in the app launcher.
BUG=179300
Review URL: https://chromiumcodereview.appspot.com/12508011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@187850 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
4 files changed, 10 insertions, 5 deletions
diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc index 2de4971..0144358 100644 --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc @@ -485,7 +485,8 @@ void CompleteInstallFunction::OnGetAppLauncherEnabled( extensions::InstallTracker* tracker = extensions::InstallTrackerFactory::GetForProfile(profile()); tracker->OnBeginExtensionInstall( - id, name, approval_->installing_icon, approval_->manifest->is_app()); + id, name, approval_->installing_icon, approval_->manifest->is_app(), + approval_->manifest->is_platform_app()); } // The extension will install through the normal extension install flow, but diff --git a/chrome/browser/extensions/install_observer.h b/chrome/browser/extensions/install_observer.h index d222062..68ffbc4 100644 --- a/chrome/browser/extensions/install_observer.h +++ b/chrome/browser/extensions/install_observer.h @@ -17,7 +17,8 @@ class InstallObserver { const std::string& extension_id, const std::string& extension_name, const gfx::ImageSkia& installing_icon, - bool is_app) = 0; + bool is_app, + bool is_platform_app) = 0; virtual void OnDownloadProgress(const std::string& extension_id, int percent_downloaded) = 0; diff --git a/chrome/browser/extensions/install_tracker.cc b/chrome/browser/extensions/install_tracker.cc index de91234..d92ccf0 100644 --- a/chrome/browser/extensions/install_tracker.cc +++ b/chrome/browser/extensions/install_tracker.cc @@ -24,12 +24,14 @@ void InstallTracker::OnBeginExtensionInstall( const std::string& extension_id, const std::string& extension_name, const gfx::ImageSkia& installing_icon, - bool is_app) { + bool is_app, + bool is_platform_app) { FOR_EACH_OBSERVER(InstallObserver, observers_, OnBeginExtensionInstall(extension_id, extension_name, installing_icon, - is_app)); + is_app, + is_platform_app)); } void InstallTracker::OnDownloadProgress(const std::string& extension_id, diff --git a/chrome/browser/extensions/install_tracker.h b/chrome/browser/extensions/install_tracker.h index fa04213..3caa907 100644 --- a/chrome/browser/extensions/install_tracker.h +++ b/chrome/browser/extensions/install_tracker.h @@ -27,7 +27,8 @@ class InstallTracker : public ProfileKeyedService { const std::string& extension_id, const std::string& extension_name, const gfx::ImageSkia& installing_icon, - bool is_app); + bool is_app, + bool is_platform_app); void OnDownloadProgress(const std::string& extension_id, int percent_downloaded); void OnInstallFailure(const std::string& extension_id); |