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