| OLD | NEW |
| 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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 #include "extensions/common/permissions/permission_message_provider.h" | 54 #include "extensions/common/permissions/permission_message_provider.h" |
| 55 #include "extensions/common/permissions/permission_set.h" | 55 #include "extensions/common/permissions/permission_set.h" |
| 56 #include "extensions/common/permissions/permissions_data.h" | 56 #include "extensions/common/permissions/permissions_data.h" |
| 57 #include "extensions/common/user_script.h" | 57 #include "extensions/common/user_script.h" |
| 58 #include "grit/chromium_strings.h" | 58 #include "grit/chromium_strings.h" |
| 59 #include "grit/extensions_strings.h" | 59 #include "grit/extensions_strings.h" |
| 60 #include "grit/generated_resources.h" | 60 #include "grit/generated_resources.h" |
| 61 #include "grit/theme_resources.h" | 61 #include "grit/theme_resources.h" |
| 62 #include "third_party/skia/include/core/SkBitmap.h" | 62 #include "third_party/skia/include/core/SkBitmap.h" |
| 63 #include "ui/base/l10n/l10n_util.h" | 63 #include "ui/base/l10n/l10n_util.h" |
| 64 #include "ui/base/resource/resource_bundle.h" | |
| 65 | 64 |
| 66 #if defined(OS_CHROMEOS) | 65 #if defined(OS_CHROMEOS) |
| 67 #include "chrome/browser/chromeos/login/users/user_manager.h" | 66 #include "chrome/browser/chromeos/login/users/user_manager.h" |
| 68 #endif | 67 #endif |
| 69 | 68 |
| 70 using base::UserMetricsAction; | 69 using base::UserMetricsAction; |
| 71 using content::BrowserThread; | 70 using content::BrowserThread; |
| 72 using extensions::SharedModuleInfo; | 71 using extensions::SharedModuleInfo; |
| 73 | 72 |
| 74 namespace extensions { | 73 namespace extensions { |
| (...skipping 818 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 893 if (!prefs->DidExtensionEscalatePermissions(extension()->id())) | 892 if (!prefs->DidExtensionEscalatePermissions(extension()->id())) |
| 894 return; | 893 return; |
| 895 | 894 |
| 896 if (client_) { | 895 if (client_) { |
| 897 AddRef(); // Balanced in InstallUIProceed() and InstallUIAbort(). | 896 AddRef(); // Balanced in InstallUIProceed() and InstallUIAbort(). |
| 898 client_->ConfirmReEnable(this, extension()); | 897 client_->ConfirmReEnable(this, extension()); |
| 899 } | 898 } |
| 900 } | 899 } |
| 901 | 900 |
| 902 } // namespace extensions | 901 } // namespace extensions |
| OLD | NEW |