Chromium Code Reviews| Index: chrome/browser/extensions/extension_service.cc |
| diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc |
| index 0a0e19b181e02a952f1339ba41f89e5040b704ee..7bd8395725e751efb224db37a54a45461652302e 100644 |
| --- a/chrome/browser/extensions/extension_service.cc |
| +++ b/chrome/browser/extensions/extension_service.cc |
| @@ -27,6 +27,7 @@ |
| #include "base/utf_string_conversions.h" |
| #include "base/values.h" |
| #include "base/version.h" |
| +#include "chrome/browser/app_mode/app_mode_utils.h" |
| #include "chrome/browser/browser_process.h" |
| #include "chrome/browser/devtools/devtools_window.h" |
| #include "chrome/browser/extensions/api/app_runtime/app_runtime_api.h" |
| @@ -2203,9 +2204,12 @@ void ExtensionService::CheckPermissionsIncrease(const Extension* extension, |
| int disable_reasons = extension_prefs_->GetDisableReasons(extension->id()); |
| bool is_default_app_install = |
|
xiyuan
2013/05/23 03:05:39
nit: Give |is_default_app_install| a new name sinc
miket_OOO
2013/05/24 15:45:19
Yes.
zel
2013/05/24 22:10:05
Done.
|
| - (!is_extension_upgrade && extension->was_installed_by_default()); |
| + (!is_extension_upgrade && extension->was_installed_by_default()) || |
| + chrome::IsRunningInForcedAppMode(); |
| // Silently grant all active permissions to default apps only on install. |
| // After install they should behave like other apps. |
| + // Silently grant all active permissions to apps install in kiosk mode on both |
| + // install and update. |
| if (is_default_app_install) |
| GrantPermissions(extension); |