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

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

Issue 239543005: Introduce extensions_strings.grd (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: move localized strings Created 6 years, 8 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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 #include "extensions/common/feature_switch.h" 46 #include "extensions/common/feature_switch.h"
47 #include "extensions/common/file_util.h" 47 #include "extensions/common/file_util.h"
48 #include "extensions/common/manifest.h" 48 #include "extensions/common/manifest.h"
49 #include "extensions/common/manifest_handlers/kiosk_mode_info.h" 49 #include "extensions/common/manifest_handlers/kiosk_mode_info.h"
50 #include "extensions/common/manifest_handlers/shared_module_info.h" 50 #include "extensions/common/manifest_handlers/shared_module_info.h"
51 #include "extensions/common/permissions/permission_message_provider.h" 51 #include "extensions/common/permissions/permission_message_provider.h"
52 #include "extensions/common/permissions/permission_set.h" 52 #include "extensions/common/permissions/permission_set.h"
53 #include "extensions/common/permissions/permissions_data.h" 53 #include "extensions/common/permissions/permissions_data.h"
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/generated_resources.h" 57 #include "grit/generated_resources.h"
57 #include "grit/theme_resources.h" 58 #include "grit/theme_resources.h"
58 #include "third_party/skia/include/core/SkBitmap.h" 59 #include "third_party/skia/include/core/SkBitmap.h"
59 #include "ui/base/l10n/l10n_util.h" 60 #include "ui/base/l10n/l10n_util.h"
60 #include "ui/base/resource/resource_bundle.h" 61 #include "ui/base/resource/resource_bundle.h"
61 62
62 #if defined(OS_CHROMEOS) 63 #if defined(OS_CHROMEOS)
63 #include "chrome/browser/chromeos/login/user_manager.h" 64 #include "chrome/browser/chromeos/login/user_manager.h"
64 #endif 65 #endif
65 66
(...skipping 824 matching lines...) Expand 10 before | Expand all | Expand 10 after
890 if (!prefs->DidExtensionEscalatePermissions(extension()->id())) 891 if (!prefs->DidExtensionEscalatePermissions(extension()->id()))
891 return; 892 return;
892 893
893 if (client_) { 894 if (client_) {
894 AddRef(); // Balanced in InstallUIProceed() and InstallUIAbort(). 895 AddRef(); // Balanced in InstallUIProceed() and InstallUIAbort().
895 client_->ConfirmReEnable(this, extension()); 896 client_->ConfirmReEnable(this, extension());
896 } 897 }
897 } 898 }
898 899
899 } // namespace extensions 900 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698